original_kernel/drivers/misc
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
..
hdpuftrs
ibmasm
sgi-xp cpumask: Optimize cpumask_of_cpu in drivers/misc/sgi-xp/xpc_main.c 2008-07-18 22:02:58 +02:00
Kconfig HP iLO driver 2008-07-21 21:55:02 -07:00
Makefile HP iLO driver 2008-07-21 21:55:02 -07:00
acer-wmi.c acer-wmi: Remove version number 2008-07-16 23:27:02 +02:00
asus-laptop.c
atmel-ssc.c
atmel_pwm.c
atmel_tclib.c
compal-laptop.c
eeepc-laptop.c
eeprom_93cx6.c
enclosure.c
fujitsu-laptop.c
hpilo.c HP iLO driver 2008-07-21 21:55:02 -07:00
hpilo.h HP iLO driver 2008-07-21 21:55:02 -07:00
intel_menlow.c
ioc4.c
kgdbts.c
lkdtm.c
msi-laptop.c
phantom.c device create: misc: convert device_create to device_create_drvdata 2008-07-21 21:54:44 -07:00
sony-laptop.c
tc1100-wmi.c
thinkpad_acpi.c
tifm_7xx1.c
tifm_core.c