Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:22:10 +0000 (20:22 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 3 Feb 2010 19:22:10 +0000 (20:22 +0100)
commit111d6c6ad15d1425d3e5a678b2ff4b593e910fca
treefebbcf93318ed9265c4efef9b63c1a1249067d1f
parent08254a1a9795711a6e43ad6e73d88a3988706731
parent4710cee1b5292fe077a67cc23193cc43060fbe3d
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx