forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'merge' into next

Browse source 
Brings in various bug fixes from 3.6-rcX
This commit is contained in:
Benjamin Herrenschmidt 2012-09-07 09:48:59 +10:00
commit fff34b3412
1124 changed files with 12465 additions and 8185 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/powerpc/include/asm/processor.h
View file

@ -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);