Merge git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Wed, 21 Mar 2018 22:58:03 +0000 (18:58 -0400)
committerTom Rini <[email protected]>
Wed, 21 Mar 2018 22:58:03 +0000 (18:58 -0400)

Trivial merge