]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7151a236ad9aae552371c397ebe44d0faf1c51e1
treeeafcf756975739ef04aa91be2e053d6e1e8b9ccb
parent36e08ae6ade9631e776f5e3930b67a16d01ca273
parent4a8952185ecb473c81a423c818b855cf24b9cd6a
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
arch/x86/kernel/apic/probe_32.c