Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Fri, 11 Dec 2015 15:29:28 +0000 (10:29 -0500)
committerTom Rini <[email protected]>
Fri, 11 Dec 2015 15:29:28 +0000 (10:29 -0500)

Trivial merge