Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Mon, 14 Jan 2008 09:48:28 +0000 (10:48 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 14 Jan 2008 09:48:28 +0000 (10:48 +0100)

Trivial merge