[lkml]   [2011]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the cpufreq tree with the s5p tree
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.


 \ /
  Last update: 2011-03-11 03:43    [W:0.045 / U:1.780 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site