Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Sun, 17 Jan 2016 02:45:31 +0000 (21:45 -0500)
committerTom Rini <[email protected]>
Sun, 17 Jan 2016 02:45:31 +0000 (21:45 -0500)

Trivial merge