Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:34:11 +0000 (09:34 -0700)
committerWolfgang Denk <wd@denx.de>
Sun, 13 Apr 2008 16:34:11 +0000 (09:34 -0700)

Trivial merge