Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sat, 1 Nov 2008 15:07:43 +0000 (16:07 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 1 Nov 2008 15:07:43 +0000 (16:07 +0100)

Trivial merge