Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Fri, 30 Apr 2010 22:42:22 +0000 (00:42 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 30 Apr 2010 22:42:22 +0000 (00:42 +0200)
commit0903b524abd3abfb1e4c3197ba6652bd8c98fe9a
tree3b78970cc6a33da0276cecdfc9f139debb764a8d
parent68651683593958cedcdfb9d06a5fe0a524f8dd6e
parentd3061c692155412aa87e7f4f66b4a2c7b77ee417
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx