Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorTom Rini <trini@ti.com>
Tue, 29 Jan 2013 20:36:23 +0000 (15:36 -0500)
committerTom Rini <trini@ti.com>
Tue, 29 Jan 2013 20:36:23 +0000 (15:36 -0500)

Trivial merge