git.openwrt.org Git - openwrt/staging/blogic.git/commit

Merge branch 'x86/mm' into x86/asm, to unify the two branches for simplicity

Signed-off-by: Ingo Molnar <mingo@kernel.org>

John Crispins staging tree

arch/x86/kernel/apic/x2apic_cluster.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/x2apic_uv_x.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup_percpu.c	diff1 \|	diff2 \|	blob \| history