Merge branch 'next' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Fri, 28 May 2010 18:34:39 +0000 (20:34 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 28 May 2010 18:34:39 +0000 (20:34 +0200)

Trivial merge