Merge branch 'next' of git://git.denx.de/u-boot-coldfire

author Wolfgang Denk <wd@denx.de>

Tue, 4 Aug 2009 19:54:11 +0000 (21:54 +0200)

committer Wolfgang Denk <wd@denx.de>

Tue, 4 Aug 2009 19:54:11 +0000 (21:54 +0200)
author Wolfgang Denk <wd@denx.de>
Tue, 4 Aug 2009 19:54:11 +0000 (21:54 +0200)
committer Wolfgang Denk <wd@denx.de>
Tue, 4 Aug 2009 19:54:11 +0000 (21:54 +0200)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
diff --cc lib_m68k/board.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Tue, 4 Aug 2009 19:54:11 +0000 (21:54 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Tue, 4 Aug 2009 19:54:11 +0000 (21:54 +0200)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib_m68k/board.c	patch \|	diff1 \|	diff2 \|	blob \| history