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

Trivial merge