Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 21:52:32 +0000 (23:52 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 7 Apr 2008 21:52:32 +0000 (23:52 +0200)

Trivial merge