linux-next: manual merge of the tip tree with the cpufreq tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature