From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 21 Aug 2018 20:39:24 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq', 'pm-pci' and 'pm-sleep'
X-Git-Tag: android-x86-8.1-r1~398^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=01ac7c4c2e035bc8d0d47dc880bbc25bf562a648;p=android-x86%2Fkernel.git

Merge branches 'pm-cpufreq', 'pm-pci' and 'pm-sleep'

Merge fixes for the ondemand and conservative cpufreq governors,
PCI power management and system wakeup framework.

* pm-cpufreq:
  cpufreq: governor: Avoid accessing invalid governor_data

* pm-pci:
  PCI / ACPI / PM: Resume all bridges on suspend-to-RAM

* pm-sleep:
  PM / sleep: wakeup: Fix build error caused by missing SRCU support
---

01ac7c4c2e035bc8d0d47dc880bbc25bf562a648