From 0927679c26e461abdce8704bfb5dea7646570109 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Mon, 10 Oct 2011 20:39:40 -0700 Subject: Commit uncommitted collision fix from last merge Missed one silly collision line in the last merge. Signed-off-by: John Stultz --- drivers/usb/host/ehci-q.c | 4 ---- 1 file changed, 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); -- cgit v1.2.3