Merge branch 'master' of git://git.denx.de/u-boot-ti
authorTom Rini <trini@ti.com>
Thu, 15 Jan 2015 19:05:31 +0000 (14:05 -0500)
committerTom Rini <trini@ti.com>
Fri, 16 Jan 2015 15:25:01 +0000 (10:25 -0500)

Trivial merge