Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Thu, 8 Oct 2015 07:03:41 +0000 (03:03 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 8 Oct 2015 07:03:41 +0000 (03:03 -0400)

Trivial merge