| commit | 417c765af914106f5e76c4e0181dd555fe6a89a0 | [log] [tgz] |
|---|---|---|
| author | Alan Stern <stern@rowland.harvard.edu> | Thu Mar 21 12:48:42 2013 -0400 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu Mar 21 15:00:18 2013 -0700 |
| tree | 8234b26bc9dd1703124d49106b49e8fb0bfce3f7 | |
| 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>