Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sat, 17 Nov 2007 00:33:33 +0000 (01:33 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 17 Nov 2007 00:33:33 +0000 (01:33 +0100)

Trivial merge