Merge remote-tracking branch 'usb/usb-next'

Conflicts:
	drivers/usb/misc/ezusb.c

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/misc/ezusb.c
index 6589268a651517da44f99cd7391e2ca35f84f12a,0a48de91df3a5ca5d96ee55dd537df211554cd3e..e712afed947c0743dffa1a099ca91832288eeb89
--- 1/drivers/usb/misc/ezusb.c
--- 2/drivers/usb/misc/ezusb.c
+++ b/drivers/usb/misc/ezusb.c
@@@ -157,5 -162,4 +162,6 @@@ int ezusb_fx2_ihex_firmware_download(st
        return ezusb_ihex_firmware_download(dev, ezusb_fx2, firmware_path);
  }
  EXPORT_SYMBOL_GPL(ezusb_fx2_ihex_firmware_download);
+ #endif
 +
 +MODULE_LICENSE("GPL");