Simon Glass 53302bdc48 Remove some merge markers ...

These two files have patch merge markers in them, within comments or
strings. Remove then, so that a search for merge markers does not show up
matches in these files.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Jagan Teki <jteki@openedev.com>

2016-10-23 18:33:18 -04:00

..

dwc2.c

usb: dwc2: Add delay to fix the USB detection problem on SoCFPGA

2016-05-06 20:06:56 +02:00

dwc2.h

…

ehci-armada100.c

…

ehci-atmel.c

usb: replace ehci_*_remove() with usb_deregister()

2016-09-23 17:53:46 -04:00

ehci-exynos.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

ehci-faraday.c

…

ehci-fsl.c

usb: replace ehci_*_remove() with usb_deregister()

2016-09-23 17:53:46 -04:00

ehci-generic.c

usb: ehci-generic: support reset control for generic EHCI

2016-09-23 22:25:44 -04:00

ehci-hcd.c

usb: ehci: only shutdown opened controller

2016-06-18 00:49:00 +02:00

ehci-marvell.c

usb: ehci: ehci-marvell.c: Add Armada 3700 support (ARMv8)

2016-09-27 17:29:53 +02:00

ehci-mpc512x.c

ehci-ci.h: drop generic USBCMD fields

2016-04-01 17:18:11 -04:00

ehci-msm.c

ehci: Add support for Qualcomm EHCI

2016-04-01 17:18:11 -04:00

ehci-mx5.c

usb: Rename ehci-fsl.h to ehci-ci.h

2016-04-01 17:18:10 -04:00

ehci-mx6.c

usb: replace ehci_*_remove() with usb_deregister()

2016-09-23 17:53:46 -04:00

ehci-mxc.c

usb: Rename ehci-fsl.h to ehci-ci.h

2016-04-01 17:18:10 -04:00

ehci-mxs.c

…

ehci-omap.c

…

ehci-pci.c

usb: pci: Fix cast for 64-bit compilation

2016-10-11 11:55:33 +08:00

ehci-ppc4xx.c

…

ehci-rmobile.c

…

ehci-spear.c

…

ehci-sunxi.c

sunxi: H3: Do not clear usb companion clk-gate / reset on remove

2016-04-12 08:58:03 +02:00

ehci-tegra.c

ARM: tegra: fix USB ULPI PHY reset signal inversion confusion

2016-09-27 09:11:03 -07:00

ehci-vct.c

…

ehci-vf.c

usb: host: ehci-vf: Migrate Vybrid USB to driver model

2016-09-27 23:30:22 +02:00

ehci-zynq.c

usb: replace ehci_*_remove() with usb_deregister()

2016-09-23 17:53:46 -04:00

ehci.h

ehci-hcd: Add init_after_reset

2016-04-01 17:18:08 -04:00

isp116x-hcd.c

Remove some merge markers

2016-10-23 18:33:18 -04:00

isp116x.h

…

Kconfig

usb: xhci: Add Marvell MVEBU xHCI support

2016-09-27 17:29:52 +02:00

Makefile

usb: xhci: Add Marvell MVEBU xHCI support

2016-09-27 17:29:52 +02:00

ohci-at91.c

…

ohci-da8xx.c

…

ohci-ep93xx.c

…

ohci-generic.c

…

ohci-hcd.c

…

ohci-lpc32xx.c

…

ohci-s3c24xx.c

…

ohci-s3c24xx.h

…

ohci-sunxi.c

sunxi: H3: Do not clear usb companion clk-gate / reset on remove

2016-04-12 08:58:03 +02:00

ohci.h

…

r8a66597-hcd.c

…

r8a66597.h

…

sl811-hcd.c

…

sl811.h

…

usb-sandbox.c

…

usb-uclass.c

dm: Use dm_scan_fdt_dev() directly where possible

2016-07-27 14:15:54 -06:00

utmi-armada100.c

…

xhci-dwc3.c

…

xhci-exynos5.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci-fsl.c

drivers: usb: xhci-fsl: Implement Erratum A-010151 for FSL USB3 controller

2016-09-27 23:30:49 +02:00

xhci-keystone.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci-mem.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci-mvebu.c

usb: xhci-mvebu: Add Armada 8K to compatiblity list

2016-09-27 17:29:54 +02:00

xhci-omap.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci-pci.c

…

xhci-ring.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci-rockchip.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci-zynqmp.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci.c

treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>

2016-09-23 22:25:27 -04:00

xhci.h

…