tree a6adc2d83018b98e45c91dbbc9c80e95d8a671b1
parent 3e79a8a67d6f28b2b1d4344253ca612e77cca8e6
parent b39b0981b0811943d724915a8a0150d6ac5110e0
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1372417266 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1372417266 +0200

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