Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Fri, 6 Nov 2015 14:17:17 +0000 (09:17 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 6 Nov 2015 14:17:17 +0000 (09:17 -0500)

Trivial merge