Merge branch 'usb-linus' into usb-next

This lets us fix the build error that happens when these two trees are merged
together.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

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

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