Merge branch 'next' of git://www.denx.de/git/u-boot-ppc4xx into next
authorWolfgang Denk <wd@denx.de>
Sat, 21 Nov 2009 22:14:58 +0000 (23:14 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 21 Nov 2009 22:14:58 +0000 (23:14 +0100)

Trivial merge