diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-03-21 17:48:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 23:00:18 +0100 |
| commit | 417c765af914106f5e76c4e0181dd555fe6a89a0 (patch) | |
| tree | 8234b26bc9dd1703124d49106b49e8fb0bfce3f7 /fs/cifs/file.c | |
| parent | Revert "USB: quatech2: only write to the tty if the port is open." (diff) | |
| download | linux-417c765af914106f5e76c4e0181dd555fe6a89a0.tar.xz linux-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 <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/cifs/file.c')
0 files changed, 0 insertions, 0 deletions