git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 8 Jun 2017 23:25:16 +0000 (01:25 +0200)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Thu, 8 Jun 2017 23:25:16 +0000 (01:25 +0200)
commit	fbd78afe34d9cc3a86aff7cc214d9f06e815e63e
tree	764542d5535678f9cd985f22416a0b6280203e0e	tree \| snapshot
parent	3c2993b8c6143d8a5793746a54eba8f86f95240f	commit \| diff
parent	57caf4ec2b8bfbcb4f738ab5a12eedf3a8786045	commit \| diff
parent	f3b7eaae1b35eb8077610eb7c7db042c9b0645e1	commit \| diff

Merge branches 'intel_pstate' and 'pm-sleep'

* intel_pstate:
cpufreq: intel_pstate: Avoid division by 0 in min_perf_pct_min()

* pm-sleep:
Revert "ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle"

drivers/acpi/battery.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/button.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
drivers/acpi/sleep.c	diff1 \|	diff2 \|	diff3 \|	blob \| history