Merge branch 3.13-rc4 into usb-next

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

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

diff --cc drivers/usb/host/ohci-pxa27x.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/wusbcore/security.c
index 4c40d0dbf53d45c35ae5b05798f1f09566ffc29e,66655e8f23089cc758c7199015de094252fd927a..790c0b5c354ce637ae648b284a83a53e4db8eda4
--- 1/drivers/usb/wusbcore/security.c
--- 2/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@@ -189,9 -190,9 +189,9 @@@ static int wusb_dev_set_gtk(struct wusb
                usb_dev, usb_sndctrlpipe(usb_dev, 0),
                USB_REQ_SET_DESCRIPTOR,
                USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
 -              USB_DT_KEY << 8 | wusbhc->gtk_index, 0,
 +              USB_DT_KEY << 8 | key_index, 0,
                &wusbhc->gtk.descr, wusbhc->gtk.descr.bLength,
-               1000);
+               USB_CTRL_SET_TIMEOUT);
  }