Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Fri, 14 Nov 2014 21:39:32 +0000 (16:39 -0500)
committerTom Rini <trini@ti.com>
Fri, 14 Nov 2014 21:39:32 +0000 (16:39 -0500)

Trivial merge