From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 18 Dec 2008 10:55:06 +0000 (+0100)
Subject: Merge branch 'x86/apic' into cpus4096
X-Git-Tag: v2.6.29-rc1~538^2~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9a3d8f735eee90bb5b1351983e946bc637041c01;p=linux-2.6-omap-h63xx.git

Merge branch 'x86/apic' into cpus4096

This done for conflict prevention: we merge it into the cpus4096 tree
because upcoming cpumask changes will touch apic.c that would collide
with x86/apic otherwise.
---

9a3d8f735eee90bb5b1351983e946bc637041c01