mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 11:51:27 +00:00
237c78beb8
Conflicts: arch/arm/mach-exynos/Makefile arch/arm/mach-exynos/cpu.c -> common.c arch/arm/mach-exynos/include/mach/entry-macro.S arch/arm/mach-exynos/init.c -> common.c arch/arm/mach-s5p64x0/init.c -> common.c arch/arm/mach-s5pv210/init.c -> common.c Multiple files were moved into common.c files in the rmk/for-linus branch, so this moves over the samsung/dt changes to the new files. 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-sdhci.c | ||
| setup-usb-phy.c | ||