From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 15 Jun 2013 22:32:02 +0000 (+0200)
Subject: Merge branch 'pm-cpuidle-next' into linux-next
X-Git-Tag: next-20130617~79^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=977a925e76627d6a735e27cc142cdffa144c7319;p=karo-tx-linux.git

Merge branch 'pm-cpuidle-next' into linux-next

* pm-cpuidle-next:
  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
---

977a925e76627d6a735e27cc142cdffa144c7319