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

Merge branches 'pm-core', 'powercap' and 'pm-tools'

* pm-core:
  PM / wakeirq: fix wakeirq setting after wakup re-configuration from sysfs
  PM / runtime: Document steps for device removal

* powercap:
  powercap: intel_rapl: Add missing Haswell model

* pm-tools:
  tools/power turbostat: work around RC6 counter wrap
  tools/power turbostat: initial KBL support
  tools/power turbostat: initial SKX support
  tools/power turbostat: decode BXT TSC frequency via CPUID
  tools/power turbostat: initial BXT support
  tools/power turbostat: print IRTL MSRs
  tools/power turbostat: SGX state should print only if --debug

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Fri, 8 Apr 2016 19:46:56 +0000 (21:46 +0200)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Fri, 8 Apr 2016 19:46:56 +0000 (21:46 +0200)
commit	d42f590397d9b836b7360fc6719d53f154da8f28
tree	bbd0ce89528957005c56d6066a79d25b2ccda581	tree \| snapshot
parent	79c9b835f7e767317262f85ddec6f630e7c2d7f6	commit \| diff
parent	c37d773c7d162e62832df04ed30fa86b91b50305	commit \| diff
parent	befb65989dad4e5c8f8ea1dc94fd0ca5661a61f0	commit \| diff
parent	2eee958fb5f2efe5865ca3f0bec3bdef827e821d	commit \| diff

arch/x86/include/asm/msr-index.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
tools/power/x86/turbostat/turbostat.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history