Merge 3.11-rc3 into usb-next

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

diff --cc drivers/usb/host/pci-quirks.h
Simple merge

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

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

diff --cc drivers/usb/serial/cp210x.c
Simple merge

diff --cc drivers/usb/serial/mos7840.c
Simple merge

diff --cc drivers/usb/serial/ti_usb_3410_5052.c
Simple merge

diff --cc include/linux/usb.h
Simple merge