Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Thu, 13 Oct 2016 00:48:43 +0000 (20:48 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 13 Oct 2016 00:48:43 +0000 (20:48 -0400)

Trivial merge