Merge branch 'master' of git://git.denx.de/u-boot-mpc82xx
authorTom Rini <trini@ti.com>
Sun, 10 Mar 2013 13:47:50 +0000 (09:47 -0400)
committerTom Rini <trini@ti.com>
Sun, 10 Mar 2013 13:47:50 +0000 (09:47 -0400)

Trivial merge