Merge git://www.denx.de/git/u-boot-ppc4xx
authorTom Rini <trini@konsulko.com>
Tue, 9 Aug 2016 11:16:01 +0000 (07:16 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 9 Aug 2016 11:16:01 +0000 (07:16 -0400)

Trivial merge