Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 8 Jan 2008 12:41:42 +0000 (13:41 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 8 Jan 2008 12:41:42 +0000 (13:41 +0100)

Trivial merge