mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-08 14:54:23 +08: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> |
||
---|---|---|
.. | ||
omap | ||
arm-boards | ||
calxeda.txt | ||
fsl.txt | ||
gic.txt | ||
insignal-boards.txt | ||
l2cc.txt | ||
picoxcell.txt | ||
pmu.txt | ||
primecell.txt | ||
samsung-boards.txt | ||
sirf.txt | ||
vic.txt | ||
xilinx.txt |