Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 21 Jan 2010 21:27:54 +0000 (22:27 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 21 Jan 2010 21:27:54 +0000 (22:27 +0100)

Trivial merge