Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Mon, 10 Aug 2015 14:06:07 +0000 (10:06 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 10 Aug 2015 14:06:07 +0000 (10:06 -0400)

Trivial merge