Merge branch 'next' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Sun, 10 Apr 2011 19:20:28 +0000 (21:20 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 10 Apr 2011 19:20:28 +0000 (21:20 +0200)

Trivial merge