Merge branch 'master' of git://www.denx.de/git/u-boot-dm
authorTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 23:37:20 +0000 (19:37 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 28 Apr 2015 23:37:20 +0000 (19:37 -0400)

Trivial merge