summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-11-07 04:14:50 +0100
committerLen Brown <len.brown@intel.com>2011-11-07 04:14:50 +0100
commitefb90582c575084723cc14302c1300cb26c7e01f (patch)
tree25af70a2c40e7e404215acd9aadfa42e71e716ae /drivers/acpi
parentMerge branches 'atomic-io', 'lockdep', 'misc', 'pm-profile' and 'pnp-cleanup'... (diff)
parentcpuidle: Single/Global registration of idle states (diff)
parentmrst pmu: update comment (diff)
parenttools/power turbostat: less verbose debugging (diff)
downloadlinux-efb90582c575084723cc14302c1300cb26c7e01f.tar.xz
linux-efb90582c575084723cc14302c1300cb26c7e01f.zip
Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next