Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
|---|---|---|
| .. | ||
| debug-macro.S | ||
| entry-macro.S | ||
| eth.h | ||
| hardware.h | ||
| io.h | ||
| irqs.h | ||
| netx-regs.h | ||
| param.h | ||
| pfifo.h | ||
| system.h | ||
| timex.h | ||
| uncompress.h | ||
| xc.h | ||
Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. |
||
|---|---|---|
| .. | ||
| debug-macro.S | ||
| entry-macro.S | ||
| eth.h | ||
| hardware.h | ||
| io.h | ||
| irqs.h | ||
| netx-regs.h | ||
| param.h | ||
| pfifo.h | ||
| system.h | ||
| timex.h | ||
| uncompress.h | ||
| xc.h | ||