On 04/24/13 15:54, Stephen Rothwell wrote:
Hi all,Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos/cpuidle.c between commit 554c06ba3ee2 ("cpuidle: remove en_core_tk_irqen flag") from the pm tree and commit 2eb89f893e44 ("ARM: EXYNOS: factor out the idle states") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required).
Looks OK to me, thanks. - Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
