Greg Kroah-Hartman 67635d397a Merge 3.8-rc5 into usb-next ...

This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.

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

2013-01-25 12:41:02 -08:00

25 KiB

Raw Blame History

View Raw