Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 26 Oct 2012 22:44:31 +0000 (15:44 -0700)
committerTom Rini <trini@ti.com>
Fri, 26 Oct 2012 22:44:31 +0000 (15:44 -0700)

Trivial merge