daab7fc734
Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c Merge reason: Resolve the conflicts, update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
consistent.c | ||
fault.c | ||
init.c | ||
Makefile | ||
mmu_context.c | ||
pgtable.c |