Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 9 Sep 2008 00:24:51 +0000 (02:24 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 9 Sep 2008 00:24:51 +0000 (02:24 +0200)
commitab00e7a23e088505b22cba7b84145806129b83bf
tree5acdfb4c2b87058d132dc8fe9fb81d394cb034bd
parent4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c
parent5ff889349d2ace13f10c9335e09365fcec8247cc
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

Conflicts:

Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>
Makefile