Linus Torvalds 0162818804 Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ...

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, cpu: Fix detection of Celeron Covington stepping A1 and B0
  Documentation, ABI: Update L3 cache index disable text
  x86, AMD, cacheinfo: Fix L3 cache index disable checks
  x86, AMD, cacheinfo: Fix fallout caused by max3 conversion
  x86, cpu: Change NOP selection for certain Intel CPUs
  x86, cpu: Clean up and unify the NOP selection infrastructure
  x86, percpu: Use ASM_NOP4 instead of hardcoding P6_NOP4
  x86, cpu: Move AMD Elan Kconfig under "Processor family"

Fix up trivial conflicts in alternative handling (commit dc326fca2b64
"x86, cpu: Clean up and unify the NOP selection infrastructure" removed
some hacky 5-byte instruction stuff, while commit d430d3d7e646 "jump
label: Introduce static_branch() interface" renamed HAVE_JUMP_LABEL to
CONFIG_JUMP_LABEL in the code that went away)

2011-05-19 17:55:12 -07:00

..

acpi-cpufreq.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

cpufreq_conservative.c

[CPUFREQ] Remove unneeded locks

2011-03-16 17:54:32 -04:00

cpufreq_ondemand.c

[CPUFREQ] Remove unneeded locks

2011-03-16 17:54:32 -04:00

cpufreq_performance.c

[CPUFREQ] use dynamic debug instead of custom infrastructure

2011-05-04 11:50:57 -04:00

cpufreq_powersave.c

[CPUFREQ] use dynamic debug instead of custom infrastructure

2011-05-04 11:50:57 -04:00

cpufreq_stats.c

[CPUFREQ] cpufreq_stats.c: Fixed brace coding style issue

2011-05-04 11:50:58 -04:00

cpufreq_userspace.c

[CPUFREQ] use dynamic debug instead of custom infrastructure

2011-05-04 11:50:57 -04:00

cpufreq-nforce2.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

cpufreq.c

[CPUFREQ] remove redundant sprintf from request_module call.

2011-05-04 11:50:58 -04:00

e_powersaver.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

elanfreq.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

freq_table.c

[CPUFREQ] use dynamic debug instead of custom infrastructure

2011-05-04 11:50:57 -04:00

gx-suspmod.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

Kconfig

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

Kconfig.x86

Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2011-05-19 17:55:12 -07:00

longhaul.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

longhaul.h

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

longrun.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

Makefile

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

mperf.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

mperf.h

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

p4-clockmod.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

pcc-cpufreq.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

powernow-k6.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

powernow-k7.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

powernow-k7.h

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

powernow-k8.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

powernow-k8.h

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

sc520_freq.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

speedstep-centrino.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

speedstep-ich.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

speedstep-lib.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

speedstep-lib.h

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00

speedstep-smi.c

[CPUFREQ] Move x86 drivers to drivers/cpufreq/

2011-05-19 18:51:07 -04:00