Merge git://git.denx.de/u-boot-mpc85xx
authorTom Rini <[email protected]>
Thu, 7 Jan 2016 16:24:27 +0000 (11:24 -0500)
committerTom Rini <[email protected]>
Thu, 7 Jan 2016 16:24:27 +0000 (11:24 -0500)

Trivial merge