Merge branches 'pm-core', 'powercap' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 8 Apr 2016 19:46:56 +0000 (21:46 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 8 Apr 2016 19:46:56 +0000 (21:46 +0200)
commit73659be769a4f0ac26a6b3fc6699754adba36485
treebbd0ce89528957005c56d6066a79d25b2ccda581
parentfa81e66ec8648f62e96e95e53db2ea95a4b57b26
parent16669befb0772eac6a76057b7010ba5b419c0e78
parent462d8083fb2da951ad6edb9e8000c1f2578d27a9
parent9185e988e9d5bb70b690362e84bb2e4a9d71f2c5
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
arch/x86/include/asm/msr-index.h
tools/power/x86/turbostat/turbostat.c