Merge branch 'merge' into next

Brings in various bug fixes from 3.6-rcX
2012-09-07 09:48:59 +10:00
parent 28e1e58fb6 636802ef96
commit fff34b3412
1124 changed files with 12465 additions and 8185 deletions
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -387,6 +387,7 @@ extern unsigned long cpuidle_disable;
 enum idle_boot_override {IDLE_NO_OVERRIDE = 0, IDLE_POWERSAVE_OFF};

 extern int powersave_nap;	/* set if nap mode can be used in idle loop */
+extern void power7_nap(void);

 #ifdef CONFIG_PSERIES_IDLE
 extern void update_smt_snooze_delay(int snooze);