Merge branch 'master' of git://git.denx.de/u-boot-arc
authorTom Rini <trini@konsulko.com>
Mon, 11 Apr 2016 18:05:37 +0000 (14:05 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 12 Apr 2016 00:48:28 +0000 (20:48 -0400)

Trivial merge