Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@ti.com>
Fri, 6 Sep 2013 13:37:04 +0000 (09:37 -0400)
committerTom Rini <trini@ti.com>
Fri, 6 Sep 2013 13:37:04 +0000 (09:37 -0400)

Trivial merge