Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@konsulko.com>
Fri, 8 Apr 2016 23:31:06 +0000 (19:31 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 8 Apr 2016 23:31:06 +0000 (19:31 -0400)

Trivial merge