Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 23 Sep 2010 19:16:32 +0000 (21:16 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 23 Sep 2010 19:16:32 +0000 (21:16 +0200)

Trivial merge