Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sun, 20 Jul 2008 20:55:32 +0000 (22:55 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 20 Jul 2008 20:55:32 +0000 (22:55 +0200)

Trivial merge