Merge branch 'next' of git://git.denx.de/u-boot-net
authorWolfgang Denk <wd@denx.de>
Thu, 17 Dec 2009 21:59:27 +0000 (22:59 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 17 Dec 2009 21:59:27 +0000 (22:59 +0100)

Trivial merge