Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Mon, 2 Mar 2015 12:24:27 +0000 (07:24 -0500)
committerTom Rini <[email protected]>
Mon, 2 Mar 2015 12:24:27 +0000 (07:24 -0500)

Trivial merge