Merge commit 'v2.6.37-rc7' into perf/core

Merge reason: Pick up the latest -rc.

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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
index e9e2a93783f9d6e98bbf9c627eb0e8429afc2175,78218135b48e6169d155fb4a097e5b6c8e30e53a..fb7657822aadd7cb0954f6483490b5e9a0279f60
--- 1/arch/x86/kernel/apic/apic.c
--- 2/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -1382,7 -1387,16 +1382,15 @@@ void __cpuinit end_local_APIC_setup(voi
        }
  #endif
  
 -      setup_apic_nmi_watchdog(NULL);
        apic_pm_activate();
+ 
+       /*
+        * Now that local APIC setup is completed for BP, configure the fault
+        * handling for interrupt remapping.
+        */
+       if (!smp_processor_id() && intr_remapping_enabled)
+               enable_drhd_fault_handling();
+ 
  }
  
  #ifdef CONFIG_X86_X2APIC

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
Simple merge