Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Tue, 19 Apr 2016 12:07:41 +0000 (08:07 -0400)
committerTom Rini <[email protected]>
Tue, 19 Apr 2016 12:07:41 +0000 (08:07 -0400)

Trivial merge