Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sun, 2 Mar 2008 20:30:18 +0000 (21:30 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 2 Mar 2008 20:30:18 +0000 (21:30 +0100)

Trivial merge