From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 28 Jun 2013 11:01:06 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=93bc11c3cc1f6d441df2362f0d3efea75dc0e3f4;p=linux-beck.git

Merge branch 'pm-cpuidle'

* pm-cpuidle:
  cpuidle: Fix ARCH_NEEDS_CPU_IDLE_COUPLED dependency warning
  cpuidle: Comment the driver's framework code
  cpuidle: simplify multiple driver support
  ARM: zynq: Add cpuidle support
  cpuidle: improve governor Kconfig options
---

93bc11c3cc1f6d441df2362f0d3efea75dc0e3f4