summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-01-18 02:56:04 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-01-18 02:56:04 +0100
commitee43730d65155c5b3c3d0531f11daf59f8f42a73 (patch)
tree42b0cda8ad56020394a606d44136719212ace490
parentbcaea4678f0dc044c34c35ce8ab338106355102f (diff)
parentb68bf11ebb536ee77c78baa56793b297212a38cd (diff)
parent18065bee38a0430d503b52ed7a3492adc9e530d2 (diff)
parent5a2772a82034722b4d4c7a2d4bfd07939ee46926 (diff)
parentfbe313884d7ddd73ce457473cbdf3763f5b1d3da (diff)
downloadlinux-ee43730d65155c5b3c3d0531f11daf59f8f42a73.tar.bz2
Merge branches 'pm-opp', 'pm-devfreq', 'pm-avs' and 'pm-tools'
* pm-opp: OPP: Introduce "required-opp" property OPP: Allow OPP table to be used for power-domains * pm-devfreq: PM / devfreq: Fix potential NULL pointer dereference in governor_store PM / devfreq: Propagate error from devfreq_add_device() * pm-avs: PM / AVS: rockchip-io: account for const type of of_device_id.data * pm-tools: tools/power/x86/intel_pstate_tracer: Free the trace buffer memory cpupower: Remove FSF address