Merge git://git.denx.de/u-boot-arc
authorTom Rini <trini@ti.com>
Fri, 13 Feb 2015 18:10:30 +0000 (13:10 -0500)
committerTom Rini <trini@ti.com>
Fri, 13 Feb 2015 18:10:30 +0000 (13:10 -0500)

Trivial merge