Merge git://www.denx.de/git/u-boot-ppc4xx
authorTom Rini <trini@ti.com>
Mon, 28 Jul 2014 21:48:48 +0000 (17:48 -0400)
committerTom Rini <trini@ti.com>
Mon, 28 Jul 2014 21:48:48 +0000 (17:48 -0400)

Trivial merge