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)

Trivial merge