Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Thu, 2 May 2013 23:54:32 +0000 (19:54 -0400)
committerTom Rini <trini@ti.com>
Thu, 2 May 2013 23:54:32 +0000 (19:54 -0400)

Trivial merge