[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20090612135019.e1b3bde6.sfr@canb.auug.org.au>
Date: Fri, 12 Jun 2009 13:50:19 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Rusty Russell <rusty@...tcorp.com.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Dave Jones <davej@...hat.com>
Subject: linux-next: manual merge of the rr tree with the cpufreq-current
tree
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/x86/kernel/cpu/cpufreq/speedstep-ich.c between commit
ed5a409578578f263a362d6527ad9e5a493e2a44 ("[CPUFREQ] cpumask: avoid
playing with cpus_allowed in speedstep-ich.c") from the cpufreq-current
tree and commit a5b99ac32f444cd1b7d9aa60ee468de15f8d6964
("cpumask:remove-cpumask-games-arch-x86-kernel-cpu-cpufreq-speedstep-ich.c")
from the rr tree.
Just white space differences ... I used the version from the
cpufreq-current tree.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists