From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 12 May 2009 10:17:30 +0000 (+0200)
Subject: Merge branch 'x86/apic' into irq/numa
X-Git-Tag: v2.6.31-rc1~423^2~14
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/6cda3eb62ef42aa5acd649bf99c8db544e0f4051

Merge branch 'x86/apic' into irq/numa

Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.

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

6cda3eb62ef42aa5acd649bf99c8db544e0f4051