Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 14 May 2008 12:05:49 +0000 (14:05 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 14 May 2008 12:05:49 +0000 (14:05 +0200)

Trivial merge