summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-10-18 12:28:12 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-10-18 12:28:12 +0200
commitcc19b05e3883efbbfd525747a86d0567b12c4d12 (patch)
tree6d2059a739305482077e2b7a69c2f6d6f4b3c70b /arch
parent5d113aa679b855e03629cc79c7b7a5faf2ce2b89 (diff)
parent8fa387494928ea52914b82b5d1ea132b29a8a0b6 (diff)
parent9a69e3ac41a5ab2daf230cf8503ed1aea3419a0f (diff)
Merge branches 'pm-devfreq' and 'pm-tools'
* pm-devfreq: PM / devfreq: remove redundant null pointer check before kfree PM / devfreq: stopping the governor before device_unregister() PM / devfreq: Convert to using %pOFn instead of device_node.name PM / devfreq: Make update_devfreq() public PM / devfreq: Don't adjust to user limits in governors PM / devfreq: Fix handling of min/max_freq == 0 PM / devfreq: Drop custom MIN/MAX macros PM / devfreq: Fix devfreq_add_device() when drivers are built as modules. * pm-tools: PM / tools: sleepgraph and bootgraph: upgrade to v5.2 PM / tools: sleepgraph: first batch of v5.2 changes cpupower: Fix coredump on VMWare cpupower: Fix AMD Family 0x17 msr_pstate size cpupower: remove stringop-truncation waring