Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 26 Mar 2009 21:28:52 +0000 (22:28 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 26 Mar 2009 21:28:52 +0000 (22:28 +0100)

Trivial merge