projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d48daf3 7eb9ae0)
Merge branch 'x86/apic' into x86/platform
authorIngo Molnar <mingo@kernel.org>
Mon, 18 Jun 2012 09:09:49 +0000 (11:09 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 18 Jun 2012 09:09:49 +0000 (11:09 +0200)
Merge in x86/apic to solve a vector_allocation_domain() API change semantic merge conflict.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/include/asm/x86_init.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/apic/probe_32.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/x86_init.h
Simple merge
diff --cc arch/x86/kernel/apic/probe_32.c
Simple merge