]> 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)
commitd3d0a10b499d63ea239fcc80549b94a3866eba23
tree0fddd2bb9f27e3f188e63230be1c024a57f7b373
parenteb33ebfce5ad486359f422a91323d4d6dc0809f0
parentce82dbec032c79d87b7fccfcaf2dfa9ff94293a6
parent63c27e74e949aba4e967ec5fdcd9f00e1bf9a5b9
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