Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Sat, 3 May 2008 18:46:40 +0000 (20:46 +0200)
committerWolfgang Denk <wd@denx.de>
Sat, 3 May 2008 18:46:40 +0000 (20:46 +0200)

Trivial merge