Merge branch 'master' of git://www.denx.de/git/u-boot-usb
authorTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:43:22 +0000 (13:43 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:43:22 +0000 (13:43 -0400)

Trivial merge