Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Fri, 9 May 2014 15:18:45 +0000 (11:18 -0400)
committerTom Rini <trini@ti.com>
Fri, 9 May 2014 15:18:45 +0000 (11:18 -0400)

Trivial merge