Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 22 Apr 2008 15:21:24 +0000 (17:21 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 22 Apr 2008 15:21:24 +0000 (17:21 +0200)
1  2 
Makefile

diff --cc Makefile
Simple merge