]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
Merge branch 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 11:01:06 +0000 (13:01 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 11:01:06 +0000 (13:01 +0200)
* 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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge