Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Fri, 30 Apr 2010 22:42:22 +0000 (00:42 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 30 Apr 2010 22:42:22 +0000 (00:42 +0200)

Trivial merge