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)
commitbd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc
tree8c0d3886a19dfd82551588928b448198ac5274ce
parent35269d3fca60b5f73113b0443c8e40070749c1d9
parent1117cbf2adac59050af1751af6c6a524afa5c3ef
Merge branch 'next' of git://git.denx.de/u-boot-nios