Merge branch 'master' of git://git.denx.de/u-boot-nios
authorTom Rini <trini@konsulko.com>
Mon, 8 Feb 2016 14:39:54 +0000 (09:39 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 8 Feb 2016 14:39:54 +0000 (09:39 -0500)

Trivial merge