eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Files
98af87997670af840ef178f76b4d6888534a6700
u-boot/drivers
History
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
..
adc
sandbox: add ADC driver
2015-11-02 10:38:00 +09:00
bios_emulator
bios_emulator: Fix cast for 64-bit compilation
2016-10-11 11:55:33 +08:00
block
dm: blk: Enable CONFIG_BLK if DM_MMC is enabled
2016-10-11 10:15:53 -06:00
bootcount
bootcounter_ram: Flush dcache after data is written into SDRAM
2016-04-11 20:48:25 -04:00
clk
clk: uniphier: rework UniPhier clk driver
2016-10-18 14:06:46 +09:00
core
libfdt: Bring in upstream stringlist functions
2016-10-13 13:54:10 -06:00
cpu
cpu: Add get_vendor callback
2016-10-19 09:01:51 +02:00
crypto
Various, accumulated typos collected from around the tree.
2016-10-06 20:57:40 -04:00
ddr
Various, accumulated typos collected from around the tree.
2016-10-06 20:57:40 -04:00
demo
drivers: hierarchize drivers Kconfig menu
2015-08-12 20:47:44 -04:00
dfu
dfu: Migrate to Kconfig
2016-09-27 10:46:45 -04:00
dma
treewide: replace #include <asm/errno.h> with <linux/errno.h>
2016-09-23 17:55:42 -04:00
fpga
treewide: replace #include <asm/errno.h> with <linux/errno.h>
2016-09-23 17:55:42 -04:00
gpio
libfdt: Bring in upstream stringlist functions
2016-10-13 13:54:10 -06:00
hwmon
mailaddr: Update mail address
2016-01-27 15:32:05 +01:00
i2c
libfdt: Bring in upstream stringlist functions
2016-10-13 13:54:10 -06:00
input
input: specify the default of I8042_KEYB in more correct manner
2016-10-01 20:04:35 -04:00
led
dm: led: Tidy up SPL options for the led and led-gpio
2015-09-02 21:28:22 -06:00
mailbox
libfdt: Bring in upstream stringlist functions
2016-10-13 13:54:10 -06:00
memory
memory: Move TI_AEMIF config to KCONFIG
2016-04-18 17:11:43 -04:00
misc
Merge git://git.denx.de/u-boot-dm
2016-10-12 20:48:43 -04:00
mmc
Merge branch 'master' of http://git.denx.de/u-boot-mmc
2016-10-13 08:13:56 -04:00
mtd
spl: Update ext functions to take an spl_image parameter
2016-10-06 15:08:53 -04:00
net
Remove some merge markers
2016-10-23 18:33:18 -04:00
pch
dm: Use dm_scan_fdt_dev() directly where possible
2016-07-27 14:15:54 -06:00
pci
libfdt: Sync fdt_for_each_subnode() with upstream
2016-10-13 14:10:32 -06:00
pcmcia
powerpc: mpc824x: remove MPC824X cpu support
2015-01-05 12:08:55 -05:00
phy/marvell
libfdt: Sync fdt_for_each_subnode() with upstream
2016-10-13 14:10:32 -06:00
pinctrl
pinctrl: uniphier: fix unused-const-variable warnings for GCC 6.x
2016-10-18 14:06:46 +09:00
power
libfdt: Sync fdt_for_each_subnode() with upstream
2016-10-13 14:10:32 -06:00
pwm
PWM: Correct misspellings of "module" in context of PWM
2016-10-06 20:57:43 -04:00
qe
treewide: replace #include <asm/errno.h> with <linux/errno.h>
2016-09-23 17:55:42 -04:00
ram
ram: rename CONFIG_SPL_RAM_SUPPORT to CONFIG_SPL_RAM
2015-08-18 13:46:02 -04:00
remoteproc
remoteproc: Add support for TI power processor
2016-03-14 19:18:37 -04:00
reset
libfdt: Bring in upstream stringlist functions
2016-10-13 13:54:10 -06:00
rtc
rtc: Use CONFIG_X86 instead of __I386__
2016-10-11 11:55:33 +08:00
serial
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
2016-10-08 09:33:37 -04:00
soc
Use correct spelling of "U-Boot"
2016-02-06 12:00:59 +01:00
sound
of: clean up OF_CONTROL ifdef conditionals
2015-08-18 13:46:05 -04:00
spi
libfdt: Sync fdt_for_each_subnode() with upstream
2016-10-13 14:10:32 -06:00
spmi
Merge git://git.denx.de/u-boot-dm
2016-08-12 16:00:50 -04:00
sysreset
xtensa: add support for the 'xtfpga' evaluation board
2016-08-15 18:46:40 -04:00
thermal
Fix various typos, scattered over the code.
2016-05-05 21:39:26 -04:00
timer
Merge git://git.denx.de/u-boot-dm
2016-03-14 19:21:44 -04:00
tpm
tpm: Tidy up use of size_t
2016-10-11 11:55:33 +08:00
twserial
drivers: convert makefiles to Kbuild style
2013-10-31 13:26:01 -04:00
usb
Remove some merge markers
2016-10-23 18:33:18 -04:00
video
libfdt: Bring in upstream stringlist functions
2016-10-13 13:54:10 -06:00
watchdog
imx_watchdog: Do not assert WDOG_B on watchdog init
2016-10-04 12:01:14 +02:00
Kconfig
drivers/phy: Add Marvell SerDes / PHY drivers used on Armada 3k
2016-09-27 17:29:53 +02:00
Makefile
drivers/phy: Add Marvell SerDes / PHY drivers used on Armada 3k
2016-09-27 17:29:53 +02:00