Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <trini@ti.com>
Wed, 14 Aug 2013 19:16:48 +0000 (15:16 -0400)
committerTom Rini <trini@ti.com>
Wed, 14 Aug 2013 19:16:48 +0000 (15:16 -0400)

Trivial merge