Merge branch 'next'
authorWolfgang Denk <wd@denx.de>
Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
1  2 
Makefile
common/cmd_bootm.c

diff --cc Makefile
Simple merge
Simple merge