Merge branch 'next' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Tue, 27 Apr 2010 20:53:04 +0000 (22:53 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 27 Apr 2010 20:53:04 +0000 (22:53 +0200)

Trivial merge