Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Wed, 30 Nov 2016 19:08:28 +0000 (14:08 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 1 Dec 2016 00:31:17 +0000 (19:31 -0500)

Trivial merge