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)
commit65b57ebb3031a60dddd451097dc5c435fb051b6f
tree5454164b2ec4bb59131b615360b31bf6c262588a
parentfced09ae386d1aa7fcfdf9111c99da4be56e5b43
parentd8a593c68bac7b9d9b26af6fa8c392671213ce93
Merge branch 'next' of git://git.denx.de/u-boot-nios