From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 8 Dec 2014 19:00:09 +0000 (+0100)
Subject: Merge branch 'pm-cpuidle'
X-Git-Tag: v3.19-rc1~129^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=648fcab2b060f82dc0138529af380171a2566d94;p=linux-2.6-block.git

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  cpuidle: add MAINTAINERS entry for ARM Exynos cpuidle driver
  drivers: cpuidle: Remove cpuidle-arm64 duplicate error messages
  drivers: cpuidle: Add idle-state-name description to ARM idle states
  drivers: cpuidle: Add status property to ARM idle states
  cpuidle: Invert CPUIDLE_FLAG_TIME_VALID logic
---

648fcab2b060f82dc0138529af380171a2566d94