* linux-next: manual merge of the tip tree with the cpufreq tree
@ 2010-07-27 4:14 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2010-07-27 4:14 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Thomas Renninger, Dave Jones
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/cpufreq/cpufreq.c between commit
1f247ccc157ce29b4cd1e1b9cbe3cce8f24522bf ("[CPUFREQ] x86 cpufreq: Make
trace_power_frequency cpufreq driver independent") from the cpufreq tree
and commit 4c21adf26f8fcf86a755b9b9f55c2e9fd241e1fb ("x86 cpufreq, perf:
Make trace_power_frequency cpufreq driver independent") from the tip tree.
Slightly different versions of the same patch. I used the cpufreq tree
version of this file (it has an added dprintk() and fixed whitespace).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-07-27 4:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-27 4:14 linux-next: manual merge of the tip tree with the cpufreq tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).