Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 12 May 2011 17:27:42 +0000 (19:27 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 12 May 2011 17:27:42 +0000 (19:27 +0200)
commit0e0c0892a1fab6f93ba09d89ec3315f08f1b6ef4
tree2fe8aa31f12c433194a317d5edcee87fbef41cbc
parent162eee41060896af666c70ae308d2bb13d971ccf
parent644362c40aa8d356d2cc0d230ce0c3bad279c23c
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx