Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 5 Oct 2010 12:37:25 +0000 (14:37 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 5 Oct 2010 12:37:25 +0000 (14:37 +0200)

Trivial merge