Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-s3c24xx/Kconfig between commit 785f40040874 ("cpufreq:
s3c24xx: move cpufreq driver to drivers/cpufreq") from the pm tree and
commits fb278af74b28 ("ARM: S3C24XX: Removed unneeded dependency on
CPU_S3C2410") and a4e4d22c6f53 ("ARM: S3C24XX: Removed unneeded
dependency on CPU_S3C2412") from the arm-soc tree.

I fixed it up by removing the sections from arch/arm/mach-s3c24xx/Kconfig
and can carry thefix as necessary (no action is required).

P.S. those arm-soc tree commits have a bad Author email address ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au