Manual merge of: arch/powerpc/Kconfig arch/powerpc/kernel/stacktrace.c arch/powerpc/mm/slice.c arch/ppc/kernel/smp.c |
||
|---|---|---|
| .. | ||
| device-init.c | ||
| exports.c | ||
| htab.c | ||
| hvcall.S | ||
| interrupt.c | ||
| Kconfig | ||
| Makefile | ||
| mm.c | ||
| os-area.c | ||
| platform.h | ||
| repository.c | ||
| setup.c | ||
| smp.c | ||
| spu.c | ||
| system-bus.c | ||
| time.c | ||