]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
* 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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge