Merge branch 'master' of git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Thu, 23 Apr 2015 17:53:09 +0000 (13:53 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 23 Apr 2015 18:56:10 +0000 (14:56 -0400)

Trivial merge