Merge git://git.denx.de/u-boot-mpc85xx
authorTom Rini <[email protected]>
Wed, 1 Feb 2017 21:34:36 +0000 (16:34 -0500)
committerTom Rini <[email protected]>
Wed, 1 Feb 2017 21:34:36 +0000 (16:34 -0500)

Trivial merge