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)

Trivial merge