Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@konsulko.com>
Wed, 2 Sep 2015 15:30:46 +0000 (11:30 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 2 Sep 2015 15:30:46 +0000 (11:30 -0400)

Trivial merge