Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Tue, 4 Feb 2014 15:22:23 +0000 (10:22 -0500)
committerTom Rini <trini@ti.com>
Tue, 4 Feb 2014 16:51:20 +0000 (11:51 -0500)

Trivial merge