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

Trivial merge