From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 1 May 2009 17:02:50 +0000 (+0200)
Subject: Merge branch 'x86/apic' into irq/numa
X-Git-Tag: v2.6.31-rc1~423^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4420471f14b79f2a42e4603be7794ea49b68bca4;p=pandora-kernel.git

Merge branch 'x86/apic' into irq/numa

Conflicts:
	arch/x86/kernel/apic/io_apic.c

Merge reason: non-trivial interaction between ongoing work in io_apic.c
              and the NUMA migration feature in the irq tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

4420471f14b79f2a42e4603be7794ea49b68bca4
Reading git-diff-tree failed