Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Mon, 20 Nov 2017 01:35:45 +0000 (20:35 -0500)
committerTom Rini <[email protected]>
Mon, 20 Nov 2017 01:35:45 +0000 (20:35 -0500)

Trivial merge