Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Mon, 29 Dec 2014 03:09:27 +0000 (22:09 -0500)
committerTom Rini <trini@ti.com>
Mon, 29 Dec 2014 03:09:27 +0000 (22:09 -0500)

Trivial merge