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> |
||
---|---|---|
.. | ||
clock.c | ||
cpu-freq.c | ||
dma.c | ||
gpio.c | ||
irq.c | ||
Kconfig | ||
mach-jive.c | ||
mach-smdk2413.c | ||
mach-vstms.c | ||
Makefile | ||
pm.c | ||
s3c2412.c | ||
sleep.S |