Merge branch 'master' of git://git.denx.de/u-boot-arc
authorTom Rini <trini@ti.com>
Thu, 5 Jun 2014 15:46:34 +0000 (11:46 -0400)
committerTom Rini <trini@ti.com>
Thu, 5 Jun 2014 15:46:34 +0000 (11:46 -0400)

Trivial merge