Merge git://www.denx.de/git/u-boot-ppc4xx
authorTom Rini <trini@ti.com>
Wed, 5 Nov 2014 12:12:16 +0000 (07:12 -0500)
committerTom Rini <trini@ti.com>
Wed, 5 Nov 2014 12:12:16 +0000 (07:12 -0500)

Trivial merge