Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 18 Aug 2009 11:53:54 +0000 (13:53 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 18 Aug 2009 11:53:54 +0000 (13:53 +0200)

Trivial merge