Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Thu, 28 Aug 2014 17:03:25 +0000 (13:03 -0400)
committerTom Rini <trini@ti.com>
Thu, 28 Aug 2014 17:03:25 +0000 (13:03 -0400)

Trivial merge