Hi all, Today's linux-next merge of the arm-soc tree got a conflict in:
drivers/cpufreq/exynos-cpufreq.c between commit: 62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match") from Linus' tree and commits: ac4c90c82e4d ("cpufreq: exynos: remove exynos5250 specific cpufreq driver support") 966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support") from the arm-soc tree. I fixed it up (the latter commit removed the file, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/