Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 23:13:37 +0000 (00:13 +0100)
committerWolfgang Denk <wd@denx.de>
Fri, 11 Jan 2008 23:13:37 +0000 (00:13 +0100)

Trivial merge