summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-03-04 11:18:42 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-03-04 11:18:42 +0100
commit08a2e45ac0253d4e833661979e777caa82c84e56 (patch)
tree62d7e351903d58839da0da8e8f309ebaec9f01a0 /init
parentc3739c50ef4c4d1b7df347727a222d8b909311a5 (diff)
parent34a62cd0df89dd7034165048c0921d1314191b66 (diff)
parentba6f3ec198d555d0c9b7e038cb003922aea2797d (diff)
downloadlinux-08a2e45ac0253d4e833661979e777caa82c84e56.tar.bz2
Merge branches 'pm-cpuidle' and 'powercap'
* pm-cpuidle: ACPI / processor: Set P_LVL{2,3} idle state descriptions intel_idle: add support for Jacobsville cpuidle: dt: bail out if the idle-state DT node is not compatible cpuidle: use BIT() for idle state flags and remove CPUIDLE_DRIVER_FLAGS_MASK Documentation: driver-api: PM: Add cpuidle document cpuidle: New timer events oriented governor for tickless systems * powercap: powercap/intel_rapl: add Ice Lake mobile powercap: intel_rapl: add support for Jacobsville