Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Mon, 20 Jun 2016 09:14:01 +0000 (05:14 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 20 Jun 2016 09:14:01 +0000 (05:14 -0400)

Trivial merge