Conflicts: arch/arm/include/asm/atomic.h arch/arm/include/asm/hardirq.h arch/arm/kernel/smp.c |
||
---|---|---|
.. | ||
include/mach | ||
core.h | ||
ct-ca9x4.c | ||
dcscb.c | ||
dcscb_setup.S | ||
hotplug.c | ||
Kconfig | ||
Makefile | ||
platsmp.c | ||
spc.c | ||
spc.h | ||
tc2_pm.c | ||
v2m.c |
Conflicts: arch/arm/include/asm/atomic.h arch/arm/include/asm/hardirq.h arch/arm/kernel/smp.c |
||
---|---|---|
.. | ||
include/mach | ||
core.h | ||
ct-ca9x4.c | ||
dcscb.c | ||
dcscb_setup.S | ||
hotplug.c | ||
Kconfig | ||
Makefile | ||
platsmp.c | ||
spc.c | ||
spc.h | ||
tc2_pm.c | ||
v2m.c |