Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@ti.com>
Mon, 17 Feb 2014 19:21:03 +0000 (14:21 -0500)
committerTom Rini <trini@ti.com>
Mon, 17 Feb 2014 19:21:03 +0000 (14:21 -0500)
commitb1ad03c242dae3712b9be66026f5d8c6f919c00b
tree9571df1b9b898f54024b04e58b224d2318958bb1
parent18c83588bc830dbad5a96ca19a85184da58f4d09
parent2d61e1bed2205b5ebce6b732693c30d01590f9fc
Merge branch 'master' of git://git.denx.de/u-boot-nios