From: Thomas Gleixner Date: Tue, 12 Oct 2010 14:39:44 +0000 (+0200) Subject: Merge branch 'x86/x2apic' into irq/sparseirq X-Git-Tag: firefly_0821_release~7613^2~3714^2~58 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8ffcfa4e2d96342180e02dfe1230b97778c52d72;p=firefly-linux-kernel-4.4.55.git Merge branch 'x86/x2apic' into irq/sparseirq Reason: Avoid conflicts with the x2apic modifications Signed-off-by: Thomas Gleixner --- 8ffcfa4e2d96342180e02dfe1230b97778c52d72