projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit8461689c67fc2ad3040bc019cccb541bccb5648f
treeeafcf756975739ef04aa91be2e053d6e1e8b9ccbtree | snapshot (tar.gz zip)
parentd48daf37a3d2e2b28a61e615c0fc538301edb0ddcommit | diff
parent7eb9ae0799b1e9f0b77733b432bc5f6f055b020bcommit | diff
Merge branch 'x86/apic' into x86/platform

Merge in x86/apic to solve a vector_allocation_domain() API change semantic merge conflict.

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