From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 12 Dec 2008 12:49:17 +0000 (+0100)
Subject: Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096
X-Git-Tag: v2.6.29-rc1~538^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8299608f140ae321e4eb5d1306184265d2b9511e;p=pandora-kernel.git

Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096

We merge the irq/sparseirq, x86/quirks and x86/reboot trees into the
cpus4096 tree because the io-apic changes in the sparseirq change
conflict with the cpumask changes in the cpumask tree, and we
want to resolve those.
---

8299608f140ae321e4eb5d1306184265d2b9511e
Reading git-diff-tree failed