Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in:
drivers/cpufreq/exynos-cpufreq.c
between commit:
966f2a71a92d ("cpufreq: exynos: remove Exynos4x12 specific cpufreq driver support")
from the samsung tree and commit:
62c3f2fddd43 ("cpufreq: exynos: Fix for memory leak in case SoC name does not match")
from the pm tree.
I fixed it up (I just removed the file) and can carry the fix as necessary
(no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
