summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2013-02-18 06:25:16 +0100
committerLen Brown <len.brown@intel.com>2013-02-18 06:25:16 +0100
commit2e7d0f60d8b976c951621c1bc82acf0654089c0b (patch)
treebe4eb1e6fb6bffd693191d502e58a5ea33b593e7 /drivers/acpi
parentcpuidle: remove vestage definition of cpuidle_state_usage.driver_data (diff)
parentPM idle: remove global declaration of pm_idle (diff)
parenttools/power turbostat: display SMI count by default (diff)
downloadlinux-2e7d0f60d8b976c951621c1bc82acf0654089c0b.tar.xz
linux-2e7d0f60d8b976c951621c1bc82acf0654089c0b.zip
Merge branches 'idle-remove-statedata', 'pm_idle' and 'idle-hsw-turbostat' into release