Messages in this thread | | | Date | Mon, 21 Jan 2013 15:07:11 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb tree with Linus' tree |
| |
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/io_ti.c between commit 1ee0a224bc9a ("USB: io_ti: Fix NULL dereference in chase_port()") from Linus' tree and commit f40d781554ef ("USB: io_ti: kill custom closing_wait implementation") from the usb tree.
I fixed it up (the latter removed the code fixed by the former, so I just used thet) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |