Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sat, 24 Jul 2010 18:34:13 +0000 (20:34 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 24 Jul 2010 18:34:13 +0000 (20:34 +0200)
commit96623171423a94092cde80642328fda58a92c894
treee5e98dc33dc17399ad16d85d6df1c36d44e22889
parent47ec10c5975f0ce8f4a748c7b76c45c0fb60c0ac
parent1ffcb86ce06a252ff6f4620691eb347c8ab47b61
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx