Merge branch 'next' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Wed, 9 Feb 2011 19:54:53 +0000 (20:54 +0100)
committerWolfgang Denk <wd@denx.de>
Wed, 9 Feb 2011 19:54:53 +0000 (20:54 +0100)

Trivial merge