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> |
||
---|---|---|
.. | ||
debug-macro.S | ||
dma.h | ||
dwmci.h | ||
entry-macro.S | ||
exynos4-clock.h | ||
gpio.h | ||
hardware.h | ||
io.h | ||
irqs.h | ||
map.h | ||
memory.h | ||
pm-core.h | ||
pmu.h | ||
regs-audss.h | ||
regs-clock.h | ||
regs-gpio.h | ||
regs-irq.h | ||
regs-mct.h | ||
regs-mem.h | ||
regs-pmu.h | ||
regs-sysmmu.h | ||
regs-usb-phy.h | ||
sysmmu.h | ||
system.h | ||
timex.h | ||
uncompress.h |