]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7e6c8a8) | patch
USB: EHCI: fix up incorrect merge resolution
authorAlan Stern <stern@rowland.harvard.edu>
Thu, 21 Mar 2013 16:48:42 +0000 (12:48 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Mar 2013 22:00:18 +0000 (15:00 -0700)
commit91888f93019d1b471000f19dc5fd1d87f829e45b
tree8234b26bc9dd1703124d49106b49e8fb0bfce3f7tree | snapshot
parent7e6c8a87684e76493981aa8a67d9b0c3b1c54ad6commit | 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>
drivers/usb/host/ehci-timer.c diff | blob | history
Linux Kernel Source Tree.