mirror of
https://github.com/torvalds/linux.git
synced 2026-02-04 15:28:49 +08:00
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>