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

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

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

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

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

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

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