alistair23-linux/arch/x86/kernel/cpu/cpufreq
Linus Torvalds 26dcce0fab Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (31 commits)
  NR_CPUS: Replace NR_CPUS in speedstep-centrino.c
  cpumask: Provide a generic set of CPUMASK_ALLOC macros, FIXUP
  NR_CPUS: Replace NR_CPUS in cpufreq userspace routines
  NR_CPUS: Replace per_cpu(..., smp_processor_id()) with __get_cpu_var
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genapic_flat_64.c
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/genx2apic_uv_x.c
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/proc.c
  NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/mcheck/mce_64.c
  cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c, fix
  cpumask: Use optimized CPUMASK_ALLOC macros in the centrino_target
  cpumask: Provide a generic set of CPUMASK_ALLOC macros
  cpumask: Optimize cpumask_of_cpu in lib/smp_processor_id.c
  cpumask: Optimize cpumask_of_cpu in kernel/time/tick-common.c
  cpumask: Optimize cpumask_of_cpu in drivers/misc/sgi-xp/xpc_main.c
  cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/ldt.c
  cpumask: Optimize cpumask_of_cpu in arch/x86/kernel/io_apic_64.c
  cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr
  Revert "cpumask: introduce new APIs"
  cpumask: make for_each_cpu_mask a bit smaller
  net: Pass reference to cpumask variable in net/sunrpc/svc.c
  ...

Fix up trivial conflicts in drivers/cpufreq/cpufreq.c manually
2008-07-23 18:37:44 -07:00
..
acpi-cpufreq.c cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr 2008-07-18 22:02:57 +02:00
cpufreq-nforce2.c x86: coding style fixes to x86/kernel/cpu/cpufreq/cpufreq-nforce2.c 2008-06-18 15:00:14 +02:00
e_powersaver.c [CPUFREQ] Remove debugging message from e_powersaver 2008-03-05 14:45:31 -05:00
elanfreq.c x86: convert cpuinfo_x86 array to a per_cpu array 2007-10-19 20:35:04 +02:00
gx-suspmod.c [CPUFREQ] gx-suspmod.c: use boot_cpu_data instead of current_cpu_data 2008-02-06 22:57:58 -05:00
Kconfig [CPUFREQ] Remove pointless Kconfig dependancy 2008-02-06 22:57:57 -05:00
longhaul.c x86: remove unneded casts 2008-01-30 13:33:23 +01:00
longhaul.h i386: move kernel/cpu/cpufreq 2007-10-11 11:16:27 +02:00
longrun.c [CPUFREQ] Crusoe: longrun cpufreq module reports false min freq 2008-05-19 18:17:28 -04:00
Makefile i386: move kernel/cpu/cpufreq 2007-10-11 11:16:27 +02:00
p4-clockmod.c x86: use performance variant for_each_cpu_mask_nr 2008-05-23 18:35:12 +02:00
powernow-k6.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2007-10-19 20:36:17 -07:00
powernow-k7.c [CPUFREQ] arch/x86: Add missing "space" 2008-02-06 22:57:57 -05:00
powernow-k7.h [CPUFREQ] cpufreq: remove CVS keywords 2008-05-19 18:17:49 -04:00
powernow-k8.c cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr 2008-07-18 22:02:57 +02:00
powernow-k8.h [CPUFREQ] Powernow-k8: Update to support the latest Turion processors 2008-02-06 22:57:58 -05:00
sc520_freq.c x86: convert cpuinfo_x86 array to a per_cpu array 2007-10-19 20:35:04 +02:00
speedstep-centrino.c NR_CPUS: Replace NR_CPUS in speedstep-centrino.c 2008-07-20 10:21:12 +02:00
speedstep-ich.c cpumask: Replace cpumask_of_cpu with cpumask_of_cpu_ptr 2008-07-18 22:02:57 +02:00
speedstep-lib.c Revert "speedstep-lib.c: fix frequency multiplier for Pentium4 models 0&1" 2007-11-20 14:20:21 -05:00
speedstep-lib.h i386: move kernel/cpu/cpufreq 2007-10-11 11:16:27 +02:00
speedstep-smi.c x86, cpufreq: fix Speedfreq-SMI call that clobbers ECX 2008-03-26 22:23:40 +01:00