Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Wed, 2 Jul 2014 20:38:02 +0000 (16:38 -0400)
committerTom Rini <trini@ti.com>
Wed, 2 Jul 2014 20:38:02 +0000 (16:38 -0400)

Trivial merge