From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 2 Apr 2018 09:01:02 +0000 (+0200)
Subject: Merge branches 'pm-cpuidle' and 'pm-tools'
X-Git-Tag: v4.17-rc1~159^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=103cf0e5799ce024fd28dfab716d7111afe4b117;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'pm-cpuidle' and 'pm-tools'

* pm-cpuidle:
  cpuidle: poll_state: Avoid invoking local_clock() too often
  PM: cpuidle/suspend: Add s2idle usage and time state attributes
  cpuidle: Enable coupled cpuidle support on Exynos3250 platform
  cpuidle: poll_state: Add time limit to poll_idle()
  ARM: cpuidle: Drop memory allocation error message from arm_idle_init_cpu()

* pm-tools:
  pm-graph: AnalyzeSuspend v5.0
  pm-graph: AnalyzeBoot v2.2
  pm-graph: config files and installer
---

103cf0e5799ce024fd28dfab716d7111afe4b117