Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sun, 28 Nov 2010 16:44:00 +0000 (17:44 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 28 Nov 2010 16:44:00 +0000 (17:44 +0100)

Trivial merge