Merge branch 'master' of git://www.denx.de/git/u-boot-arc
authorTom Rini <trini@ti.com>
Fri, 25 Apr 2014 19:08:43 +0000 (15:08 -0400)
committerTom Rini <trini@ti.com>
Fri, 25 Apr 2014 19:08:43 +0000 (15:08 -0400)

Trivial merge