Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Tue, 16 Dec 2014 20:20:02 +0000 (15:20 -0500)
committerTom Rini <trini@ti.com>
Tue, 16 Dec 2014 20:20:02 +0000 (15:20 -0500)

Trivial merge