Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorTom Rini <trini@ti.com>
Mon, 18 Feb 2013 14:57:06 +0000 (09:57 -0500)
committerTom Rini <trini@ti.com>
Mon, 18 Feb 2013 14:57:06 +0000 (09:57 -0500)

Trivial merge