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>

Trivial merge