git.baikalelectronics.ru Git - kernel.git/commit

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 26 Jan 2017 23:08:59 +0000 (00:08 +0100)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 26 Jan 2017 23:08:59 +0000 (00:08 +0100)
commit	96e13396989e600c9f21af20f418b19226f7463c
tree	84d721e253655d9f2b774ba95155201ff5c13dec	tree \| snapshot
parent	d7f1fb4027205b49c71f8d2513127c86e1155866	commit \| diff
parent	c214bcdf20708695563aaaecc2a6461af825f7c6	commit \| diff
parent	3d95a3df743cf7a991bca812577c43dd6e10d73f	commit \| diff

Merge branches 'pm-sleep' and 'pm-cpufreq'

* pm-sleep:
Revert "PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag"

* pm-cpufreq:
cpufreq: intel_pstate: Fix sysfs limits enforcement for performance policy

drivers/acpi/sleep.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/cpufreq/intel_pstate.c	diff1 \|	diff2 \|	diff3 \|	blob \| history