Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Thu, 5 Jun 2014 21:38:30 +0000 (17:38 -0400)
committerTom Rini <trini@ti.com>
Thu, 5 Jun 2014 21:38:30 +0000 (17:38 -0400)

Trivial merge