summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/ehci-q.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
index efd5b3131ea..b7f9496e4f0 100644
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
@@ -1097,11 +1097,7 @@ static struct ehci_qh *qh_append_tds (
* is added to flush 'token' immediatelly into
* memory, so that ehci can execute the transaction
* ASAP.
-<<<<<<< HEAD
- * */
-=======
*/
->>>>>>> upstream/linaro-3.1
ehci_sync_mem();
urb->hcpriv = qh_get (qh);