From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 12 Sep 2016 12:49:03 +0000 (+0200)
Subject: Merge branches 'pm-domains' and 'pm-cpuidle' into linux-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=946ee051e04968894143281e455d64434ee4e077;p=deliverable%2Flinux.git

Merge branches 'pm-domains' and 'pm-cpuidle' into linux-next

* pm-domains:
  PM / Domains: Always enable debugfs support if available

* pm-cpuidle:
  ARM: cpuidle: Fix error return code
---

946ee051e04968894143281e455d64434ee4e077