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	6b92b8a985f27ba45b6c5cf671a845570362fecb
tree	bbd0ce89528957005c56d6066a79d25b2ccda581	tree \| snapshot
parent	b78534331875f42345e425b05de1e77c0c144007	commit \| diff
parent	5555ce6e932622f8247f1eb02274ed5323b012b3	commit \| diff
parent	b766a0f841f7d3950467ec4321c0922f04549afe	commit \| diff
parent	06133ca21a144dd2d8ebd5773743a2d07449186c	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