Merge branch 'usb-linus' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Mar 2013 18:00:55 +0000 (11:00 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Mar 2013 18:00:55 +0000 (11:00 -0700)
commit02d5f0857bc2962625fa2d34957d43a9e3175eb4
tree1146b3a025f8257a99b9a02eb62a4e338bb6ec01
parent659597b77493959c699b4e99841a2c778eaa70bc
parent482b0b5d82bd916cc0c55a2abf65bdc69023b843
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>
drivers/usb/host/ehci-sched.c
drivers/usb/serial/ftdi_sio.c
drivers/usb/serial/usb-serial.c