Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
authorTom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:44:15 +0000 (16:44 -0400)
committerTom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:44:15 +0000 (16:44 -0400)

Trivial merge