mirror of
https://github.com/torvalds/linux
synced 2024-10-28 14:18:20 +00:00
a07613a54d
Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
||
---|---|---|
.. | ||
include/mach | ||
clock-exynos4210.c | ||
clock-exynos4212.c | ||
clock.c | ||
common.c | ||
common.h | ||
cpuidle.c | ||
dev-ahci.c | ||
dev-audio.c | ||
dev-dwmci.c | ||
dev-pd.c | ||
dev-sysmmu.c | ||
dma.c | ||
headsmp.S | ||
hotplug.c | ||
Kconfig | ||
mach-armlex4210.c | ||
mach-exynos4-dt.c | ||
mach-nuri.c | ||
mach-origen.c | ||
mach-smdk4x12.c | ||
mach-smdkv310.c | ||
mach-universal_c210.c | ||
Makefile | ||
Makefile.boot | ||
mct.c | ||
platsmp.c | ||
pm.c | ||
pmu.c | ||
setup-fimc.c | ||
setup-fimd0.c | ||
setup-i2c0.c | ||
setup-i2c1.c | ||
setup-i2c2.c | ||
setup-i2c3.c | ||
setup-i2c4.c | ||
setup-i2c5.c | ||
setup-i2c6.c | ||
setup-i2c7.c | ||
setup-keypad.c | ||
setup-sdhci-gpio.c | ||
setup-usb-phy.c |