Merge branch 'next'

author Wolfgang Denk <wd@denx.de>

Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)

committer Wolfgang Denk <wd@denx.de>

Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
author Wolfgang Denk <wd@denx.de>
Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
committer Wolfgang Denk <wd@denx.de>
Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
diff --cc Makefile
Simple merge
diff --cc common/cmd_bootm.c
Simple merge
author	Wolfgang Denk <wd@denx.de>
	Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
committer	Wolfgang Denk <wd@denx.de>
	Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/cmd_bootm.c	patch \|	diff1 \|	diff2 \|	blob \| history