USB: EHCI: fix up incorrect merge resolution

Browse source

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>

...

This commit is contained in:

Alan Stern 2013-03-21 12:48:42 -04:00 • committed by Greg Kroah-Hartman

parent 29727f3bc2

commit 417c765af9

1 changed files with 9 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

9

drivers/usb/host/ehci-timer.c

View file