Merge branch 'pm-cpuidle-next' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Apr 2013 10:32:07 +0000 (12:32 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Apr 2013 10:32:07 +0000 (12:32 +0200)
commitf69e44b2059f2238ac558b4a115ebcdefe20b9be
treebe2a95654d7c9cb38bbcbb7a83b862db359c79e1
parent0f0c8aa0d0562954cdfa135efb827067de7ba855
parentb6269efb146eb8770d753e3dc1c561f1cffb631a
Merge branch 'pm-cpuidle-next' into linux-next

* pm-cpuidle-next:
  cpuidle: imx6: remove timer broadcast initialization
  cpuidle: OMAP4: remove timer broadcast initialization
  cpuidle: ux500: remove timer broadcast initialization
  cpuidle: initialize the broadcast timer framework
  timer: move enum definition out of ifdef section
  cpuidle: kirkwood: fix coccicheck warnings
  cpuidle / kirkwood: remove redundant Kconfig option
  cpuidle / ux500 : use CPUIDLE_FLAG_TIMER_STOP flag
  cpuidle / imx6 : use CPUIDLE_FLAG_TIMER_STOP flag
  cpuidle / omap4 : use CPUIDLE_FLAG_TIMER_STOP flag
  cpuidle : handle clockevent notify from the cpuidle framework