Merge branch 'master' of git://git.denx.de/u-boot-usb
authorTom Rini <trini@konsulko.com>
Sun, 26 Feb 2017 16:56:54 +0000 (11:56 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 26 Feb 2017 16:56:54 +0000 (11:56 -0500)

Trivial merge