Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sun, 4 Jul 2010 21:37:00 +0000 (23:37 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 4 Jul 2010 21:37:00 +0000 (23:37 +0200)

Trivial merge