Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Mon, 1 Feb 2016 21:58:46 +0000 (16:58 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 1 Feb 2016 21:58:46 +0000 (16:58 -0500)

Trivial merge