Merge branch 'master' of git://git.denx.de/u-boot-arm
authorTom Rini <trini@ti.com>
Sun, 4 Jan 2015 21:09:19 +0000 (16:09 -0500)
committerTom Rini <trini@ti.com>
Sun, 4 Jan 2015 21:09:19 +0000 (16:09 -0500)

Trivial merge