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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/gadget/fsl_qe_udc.c
Simple merge

diff --cc drivers/usb/gadget/s3c-hsotg.c
Simple merge

diff --cc drivers/usb/gadget/s3c-hsudc.c
Simple merge

diff --cc drivers/usb/host/hwa-hc.c
Simple merge

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

diff --cc drivers/usb/musb/musb_core.c
Simple merge

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

diff --cc drivers/usb/storage/alauda.c
Simple merge

diff --cc drivers/usb/storage/cypress_atacb.c
Simple merge

diff --cc drivers/usb/storage/datafab.c
Simple merge

diff --cc drivers/usb/storage/ene_ub6250.c
Simple merge

diff --cc drivers/usb/storage/freecom.c
Simple merge

diff --cc drivers/usb/storage/isd200.c
Simple merge

diff --cc drivers/usb/storage/jumpshot.c
Simple merge

diff --cc drivers/usb/storage/karma.c
Simple merge

diff --cc drivers/usb/storage/onetouch.c
Simple merge

diff --cc drivers/usb/storage/realtek_cr.c
Simple merge

diff --cc drivers/usb/storage/sddr09.c
Simple merge

diff --cc drivers/usb/storage/sddr55.c
Simple merge

diff --cc drivers/usb/storage/shuttle_usbat.c
Simple merge

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