Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Wed, 9 Jan 2013 15:13:22 +0000 (08:13 -0700)
committerTom Rini <trini@ti.com>
Wed, 9 Jan 2013 15:13:22 +0000 (08:13 -0700)

Trivial merge