Merge branch 'next' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 19:46:14 +0000 (21:46 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 7 Sep 2010 19:46:14 +0000 (21:46 +0200)

Trivial merge