]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pm-cpuidle-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 15 Jun 2013 22:32:02 +0000 (00:32 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 15 Jun 2013 22:32:02 +0000 (00:32 +0200)
commit977a925e76627d6a735e27cc142cdffa144c7319
treec329163480bbd3134a349a3bd782a63e164ad2cc
parentdf182677e005f7471565336481d87702e66e1d01
parentb39b0981b0811943d724915a8a0150d6ac5110e0
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
MAINTAINERS