Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
authorTom Rini <trini@ti.com>
Thu, 20 Nov 2014 04:17:13 +0000 (23:17 -0500)
committerTom Rini <trini@ti.com>
Thu, 20 Nov 2014 04:17:13 +0000 (23:17 -0500)

Trivial merge