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://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=8299608f140ae321e4eb5d1306184265d2b9511e;p=linux-2.6-omap-h63xx.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
diff --cc arch/x86/kernel/process.c
index c27af49a4ed,c622772744d,c622772744d,a4da7c4b312..95d811a9594
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@@@@ -7,8 -7,7 -7,7 -7,8 +7,9 @@@@@
    #include <linux/module.h>
    #include <linux/pm.h>
    #include <linux/clockchips.h>
 +++#include <linux/ftrace.h>
    #include <asm/system.h>
+++ #include <asm/apic.h>
    
    unsigned long idle_halt;
    EXPORT_SYMBOL(idle_halt);