]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdc8c51f2fbcf0e03bfe5d8db60f1904b430d5fb2
tree1146b3a025f8257a99b9a02eb62a4e338bb6ec01
parent4eb70a0d9c7306656d6fb88755297d47ac37a77c
parente2759a20439a01c17619a2df0a79aece61533c9b
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