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

usb: dwc2: disable erroneous overcurrent condition

2016-03-05 02:21:36 +01:00

ehci-armada100.c

usb: ehci-hcd: add enum usb_init_type parameter to ehci_hcd_init.

2013-10-20 23:46:27 +02:00

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

dm: usb: Drop the EHCI weak functions

2015-04-18 11:11:24 -06:00

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

usb: ehci: mxs: Add board-specific callbacks

2014-09-29 09:02:16 +02:00

ehci-omap.c

usb: ehci-omap: Reset the USB Host OMAP module

2013-12-06 07:02:32 -05:00

ehci-pci.c

usb: pci: Fix cast for 64-bit compilation

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

ehci-ppc4xx.c

usb: ehci-hcd: add enum usb_init_type parameter to ehci_hcd_init.

2013-10-20 23:46:27 +02:00

ehci-rmobile.c

usb: rmobile: Use ARRAY_SIZE(usb_base_address) instead of CONFIG_USB_MAX_CONTROLLER_COUNT

2014-11-07 16:32:02 +01:00

ehci-spear.c

usb: spear: Add support for both SPEAr600 EHCI controllers

2015-08-19 22:30:20 +02:00

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

usb: ehci-hcd: add enum usb_init_type parameter to ehci_hcd_init.

2013-10-20 23:46:27 +02:00

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

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

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

drivers: usb: ohci-at91: clean up the PLLB code

2016-02-18 21:34:41 +01:00

ohci-da8xx.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

ohci-ep93xx.c

arm: ep9315: Return back Cirrus Logic EDB9315A board support

2014-07-04 23:45:48 +02:00

ohci-generic.c

usb: add support of generic OHCI devices

2015-12-17 21:54:41 +01:00

ohci-hcd.c

ohci: Add missing cache-flush for hcca area

2015-11-03 17:29:33 +01:00

ohci-lpc32xx.c

usb: ohci-lpc32xx: Use shared wait_for_bit

2016-01-25 10:39:49 -05:00

ohci-s3c24xx.c

include: move various macros to include/linux/kernel.h

2014-11-20 11:28:25 -05:00

ohci-s3c24xx.h

dm: Move s3c24xx USB driver to a proper place

2012-10-18 06:54:18 +02:00

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

usb: ohci: enable cache support

2015-08-12 20:47:48 -04:00

r8a66597-hcd.c

Move console definitions into a new console.h file

2015-11-19 20:27:50 -07:00

r8a66597.h

usb: Update some EHCI driver licenses to use SPDX

2015-07-21 17:39:38 -06:00

sl811-hcd.c

usb: add enum usb_init_type parameter to usb_lowlevel_init

2013-10-20 23:45:26 +02:00

sl811.h

drivers/usb: regorganisation

2009-04-06 20:40:46 +02:00

usb-sandbox.c

usb: sandbox: Add support for interrupt operations

2015-11-19 20:27:52 -07:00

usb-uclass.c

dm: Use dm_scan_fdt_dev() directly where possible

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

utmi-armada100.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

xhci-dwc3.c

usb: xhci: dwc3: Adding reset delay requirement as per dwc3 databook

2015-12-07 00:15:00 +01:00

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

usb: pci: Add XHCI driver for PCI

2015-02-05 22:16:42 -07:00

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

dm: usb: Support driver model in XHCI

2015-04-18 11:11:28 -06:00