From: Rafael J. Wysocki Date: Mon, 8 Apr 2013 10:32:07 +0000 (+0200) Subject: Merge branch 'pm-cpuidle-next' into linux-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f69e44b2059f2238ac558b4a115ebcdefe20b9be;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- f69e44b2059f2238ac558b4a115ebcdefe20b9be