Merge branch 'master' of git://git.denx.de/u-boot-mpc5xxx
authorTom Rini <trini@ti.com>
Mon, 27 Oct 2014 15:03:00 +0000 (11:03 -0400)
committerTom Rini <trini@ti.com>
Mon, 27 Oct 2014 15:03:00 +0000 (11:03 -0400)

Trivial merge