Merge branch 'master' of git://git.denx.de/u-boot-ti
authorTom Rini <trini@ti.com>
Fri, 29 Aug 2014 17:47:42 +0000 (13:47 -0400)
committerTom Rini <trini@ti.com>
Fri, 29 Aug 2014 17:47:42 +0000 (13:47 -0400)

Trivial merge