Rafael J. Wysocki
10baf04e95
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (35 commits)
PM idle: remove global declaration of pm_idle
unicore32 idle: delete stray pm_idle comment
openrisc idle: delete pm_idle
mn10300 idle: delete pm_idle
microblaze idle: delete pm_idle
m32r idle: delete pm_idle, and other dead idle code
ia64 idle: delete pm_idle
cris idle: delete idle and pm_idle
ARM64 idle: delete pm_idle
ARM idle: delete pm_idle
blackfin idle: delete pm_idle
sparc idle: rename pm_idle to sparc_idle
sh idle: rename global pm_idle to static sh_idle
x86 idle: rename global pm_idle to static x86_idle
APM idle: register apm_cpu_idle via cpuidle
tools/power turbostat: display SMI count by default
intel_idle: export both C1 and C1E
cpuidle: remove vestage definition of cpuidle_state_usage.driver_data
x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag
x86 idle: remove mwait_idle() and "idle=mwait" cmdline param
...
Conflicts:
arch/x86/kernel/process.c (with PM / tracing commit 43720bd)
drivers/acpi/processor_idle.c (with ACPICA commit 4f84291)
2013-02-18 22:34:11 +01:00
..
2012-12-14 09:59:59 -08:00
2012-12-13 12:00:02 -08:00
2012-12-11 19:59:32 -08:00
2013-02-10 03:32:22 -05:00
2011-12-15 08:04:42 -08:00
2012-12-12 12:22:13 -08:00
2012-06-27 19:28:24 -07:00
2012-07-18 17:01:48 -03:00
2013-02-04 11:29:52 +01:00
2012-11-29 13:23:02 -08:00
2012-10-04 13:32:37 +02:00
2012-04-16 14:20:19 +02:00
2012-10-02 18:01:26 +01:00
2011-09-08 10:33:59 +02:00
2012-10-05 13:57:47 +02:00
2012-10-24 10:41:25 +02:00
2012-09-19 17:28:47 +02:00
2012-09-04 17:29:23 +02:00
2013-01-03 15:57:04 -08:00
2012-09-17 13:11:43 -03:00
2013-01-24 16:14:04 +01:00
2012-10-24 12:00:49 +02:00
2012-07-05 21:19:39 +02:00
2013-01-24 16:04:56 +01:00
2013-01-10 09:21:19 -03:00
2012-10-24 10:41:25 +02:00
2012-10-04 13:32:37 +02:00
2011-12-15 08:14:49 +01:00
2013-02-10 03:32:22 -05:00
2011-07-31 14:02:19 -07:00
2012-06-25 09:01:15 -07:00
2011-03-18 10:39:30 +01:00