Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
|---|---|---|
| .. | ||
| include/mach | ||
| dma.c | ||
| irq.c | ||
| Makefile | ||
| Makefile.boot | ||
| riscpc.c | ||
Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
|---|---|---|
| .. | ||
| include/mach | ||
| dma.c | ||
| irq.c | ||
| Makefile | ||
| Makefile.boot | ||
| riscpc.c | ||