Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Thu, 10 Jul 2008 08:50:38 +0000 (10:50 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 10 Jul 2008 08:50:38 +0000 (10:50 +0200)

Trivial merge