Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Fri, 13 Sep 2013 22:12:36 +0000 (18:12 -0400)
committerTom Rini <trini@ti.com>
Fri, 13 Sep 2013 22:12:36 +0000 (18:12 -0400)

Trivial merge