projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 29727f3) | 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)
commit417c765af914106f5e76c4e0181dd555fe6a89a0
tree8234b26bc9dd1703124d49106b49e8fb0bfce3f7tree | snapshot
parent29727f3bc2e691d59c521ff09b4d59a743b5d9a3commit | 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
John Crispins staging tree