tree eafcf756975739ef04aa91be2e053d6e1e8b9ccb
parent d48daf37a3d2e2b28a61e615c0fc538301edb0dd
parent 7eb9ae0799b1e9f0b77733b432bc5f6f055b020b
author Ingo Molnar <mingo@kernel.org> 1340010589 +0200
committer Ingo Molnar <mingo@kernel.org> 1340010589 +0200

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>