From: Ingo Molnar Date: Mon, 18 Jun 2012 09:09:49 +0000 (+0200) Subject: Merge branch 'x86/apic' into x86/platform X-Git-Tag: firefly_0821_release~3680^2~2418^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8461689c67fc2ad3040bc019cccb541bccb5648f;p=firefly-linux-kernel-4.4.55.git 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 --- 8461689c67fc2ad3040bc019cccb541bccb5648f