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
..
common	Merge branch 'master' of git://git.denx.de/u-boot-usb	2016-09-30 21:58:44 -04:00
dwc3	usb: dwc3: Makefile: Don't build gadget code if USB_GADGET is disabled	2016-05-27 15:39:49 -04:00
emul	dm: Use dm_scan_fdt_dev() directly where possible	2016-07-27 14:15:54 -06:00
eth	net: smsc95xx: fix DM MAC address reading	2016-10-13 12:25:40 -05:00
gadget	usb:gadget: Disallow DFU in SPL for now	2016-09-27 10:46:20 -04:00
host	Remove some merge markers	2016-10-23 18:33:18 -04:00
musb	Fix spelling of "occurred".	2016-05-02 18:37:09 -04:00
musb-new	treewide: replace #include <asm/errno.h> with <linux/errno.h>	2016-09-23 17:55:42 -04:00
phy	treewide: replace #include <asm-generic/errno.h> with <linux/errno.h>	2016-09-23 22:25:27 -04:00
ulpi	usb: ulpi: Fix compile warning in read/write on 64-bit machines.	2016-04-01 17:18:09 -04:00
Kconfig	usb: gadget: Move CONFIG_USB_GADGET_DUALSPEED to Kconfig	2016-04-20 11:43:27 +02:00