Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Sat, 10 Jun 2017 22:01:22 +0000 (18:01 -0400)
committerTom Rini <[email protected]>
Sat, 10 Jun 2017 22:01:22 +0000 (18:01 -0400)

Trivial merge