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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-mmp/pxa168.c
Simple merge

diff --cc drivers/usb/Kconfig
Simple merge

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

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

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

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

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

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

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

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

diff --cc drivers/usb/host/ehci-hcd.c
Simple merge

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

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

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

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