Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Mon, 28 Jul 2014 18:54:29 +0000 (14:54 -0400)
committerTom Rini <trini@ti.com>
Mon, 28 Jul 2014 18:54:29 +0000 (14:54 -0400)

Trivial merge