Merge branch 'next' of git://git.denx.de/u-boot-net into next
authorWolfgang Denk <wd@denx.de>
Tue, 25 Aug 2009 21:03:22 +0000 (23:03 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 25 Aug 2009 21:03:22 +0000 (23:03 +0200)

Trivial merge