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

Trivial merge