Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Fri, 13 Feb 2015 18:11:09 +0000 (13:11 -0500)
committerTom Rini <[email protected]>
Fri, 13 Feb 2015 18:11:09 +0000 (13:11 -0500)

Trivial merge