Merge git://git.denx.de/u-boot-arc
authorTom Rini <trini@ti.com>
Mon, 9 Feb 2015 15:25:20 +0000 (10:25 -0500)
committerTom Rini <trini@ti.com>
Mon, 9 Feb 2015 15:25:20 +0000 (10:25 -0500)

Trivial merge