diff options
| author | Alan Stern <[email protected]> | 2013-03-21 16:48:42 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2013-03-21 22:00:18 +0000 |
| commit | 417c765af914106f5e76c4e0181dd555fe6a89a0 (patch) | |
| tree | 8234b26bc9dd1703124d49106b49e8fb0bfce3f7 /drivers/usb/class/cdc-acm.c | |
| parent | Revert "USB: quatech2: only write to the tty if the port is open." (diff) | |
| download | kernel-417c765af914106f5e76c4e0181dd555fe6a89a0.tar.gz kernel-417c765af914106f5e76c4e0181dd555fe6a89a0.zip | |
USB: EHCI: fix up incorrect merge resolution
This patch (as1671) fixes up an incorrect resolution of a merge
conflict between Greg KH's usb-linus branch and his usb-next branch.
Signed-off-by: Alan Stern <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
0 files changed, 0 insertions, 0 deletions