Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Thu, 28 Jul 2016 02:30:20 +0000 (22:30 -0400)
committerTom Rini <[email protected]>
Thu, 28 Jul 2016 02:30:20 +0000 (22:30 -0400)

Trivial merge