Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Mon, 17 Nov 2014 13:43:21 +0000 (08:43 -0500)
committerTom Rini <trini@ti.com>
Mon, 17 Nov 2014 13:43:21 +0000 (08:43 -0500)

Trivial merge