Merge remote branch 'u-boot-ppc4xx/master'
authorWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 2 Jun 2008 21:28:39 +0000 (23:28 +0200)
1  2 
MAKEALL
Makefile

diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge