Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sat, 8 Mar 2008 09:51:53 +0000 (10:51 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 8 Mar 2008 09:51:53 +0000 (10:51 +0100)

Trivial merge