Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Tue, 7 Oct 2014 11:38:39 +0000 (07:38 -0400)
committerTom Rini <trini@ti.com>
Tue, 7 Oct 2014 11:38:39 +0000 (07:38 -0400)

Trivial merge