Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Thu, 25 Feb 2016 15:35:23 +0000 (10:35 -0500)
committerTom Rini <[email protected]>
Thu, 25 Feb 2016 15:35:23 +0000 (10:35 -0500)

Trivial merge