Re: linux-next: manual merge of the cpufreq tree with the s5p tree

[Dave Jones]

On Fri, Mar 11, 2011 at 01:35:42PM +1100, Stephen Rothwell wrote:
 > Hi Dave,
 > 
 > Today's linux-next merge of the cpufreq tree got a conflict in
 > arch/arm/mach-exynos4/cpufreq.c between commit 7d30e8b3815f ("ARM:
 > EXYNOS4: Add EXYNOS4 CPU initialization support") from the s5p tree and
 > commit 44033b9c940e ([CPUFREQ] Remove the pm_message_t argument from
 > driver suspend"") from the cpufreq tree (where this file is called
 > arch/arm/mach-s5pv310/cpufreq.c).
 > 
 > Just context changes.  I fixed it up (see below) and can carry the fix as
 > necessary.

Yep, Looks fine to me. thanks.

	Dave

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/