Merge git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@konsulko.com>
Tue, 16 May 2017 18:50:36 +0000 (14:50 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 16 May 2017 18:50:36 +0000 (14:50 -0400)

Trivial merge