Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@ti.com>
Sun, 31 Aug 2014 11:45:55 +0000 (07:45 -0400)
committerTom Rini <trini@ti.com>
Sun, 31 Aug 2014 11:45:55 +0000 (07:45 -0400)

Trivial merge