]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:23:41 +0000 (21:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:23:41 +0000 (21:23 +0100)
commitdb452a458f07ddb0ae4cabec22c28a54fc7d8402
tree0fddd2bb9f27e3f188e63230be1c024a57f7b373
parentcae972b59cae3fb4fd494970d4dd40390dc67ece
parentb38c7da85e8b2ba9a84ce99c111c351f6c249910
parent213d7d8d00d1be1e59960baa39ea6024f7b1adec
Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq: fix a NULL pointer dereference in __cpufreq_governor()
  cpufreq-dt: defer probing if OPP table is not ready

* pm-cpuidle:
  cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID
  cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
  cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID
drivers/acpi/processor_idle.c
drivers/cpufreq/cpufreq-dt.c