diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2013-03-21 12:48:42 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-21 15:00:18 -0700 |
| commit | 417c765af914106f5e76c4e0181dd555fe6a89a0 (patch) | |
| tree | 8234b26bc9dd1703124d49106b49e8fb0bfce3f7 /net/ipv6/tcp_ipv6.c | |
| parent | 29727f3bc2e691d59c521ff09b4d59a743b5d9a3 (diff) | |
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 'net/ipv6/tcp_ipv6.c')
0 files changed, 0 insertions, 0 deletions