Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Tue, 16 Apr 2013 14:56:55 +0000 (10:56 -0400)
committerTom Rini <trini@ti.com>
Tue, 16 Apr 2013 14:56:55 +0000 (10:56 -0400)

Trivial merge