Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sat, 11 Oct 2014 00:59:28 +0000 (20:59 -0400)
committerTom Rini <trini@ti.com>
Sat, 11 Oct 2014 00:59:28 +0000 (20:59 -0400)

Trivial merge