Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Wed, 20 Aug 2014 20:07:34 +0000 (16:07 -0400)
committerTom Rini <trini@ti.com>
Wed, 20 Aug 2014 20:07:34 +0000 (16:07 -0400)

Trivial merge