Merge branch 'master' of git://git.denx.de/u-boot-arc
authorTom Rini <trini@ti.com>
Tue, 2 Sep 2014 20:37:17 +0000 (16:37 -0400)
committerTom Rini <trini@ti.com>
Tue, 2 Sep 2014 20:37:17 +0000 (16:37 -0400)

Trivial merge