1e8ff636be
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
cpu.c | ||
dma.c | ||
init.c | ||
Kconfig | ||
mach-smdk6442.c | ||
Makefile | ||
Makefile.boot |
1e8ff636be
Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile |
||
---|---|---|
.. | ||
include/mach | ||
clock.c | ||
cpu.c | ||
dma.c | ||
init.c | ||
Kconfig | ||
mach-smdk6442.c | ||
Makefile | ||
Makefile.boot |