Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Sat, 21 May 2016 00:43:27 +0000 (20:43 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 23 May 2016 15:51:37 +0000 (11:51 -0400)

Trivial merge