FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-24 02:18:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
e8e7b9eb11
linux/drivers/misc
History
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 hdpu_cpustate: BKL pushdown 2008-06-20 14:05:57 -06:00
ibmasm
sgi-xp cpumask: Optimize cpumask_of_cpu in drivers/misc/sgi-xp/xpc_main.c 2008-07-18 22:02:58 +02:00
acer-wmi.c acer-wmi: Remove version number 2008-07-16 23:27:02 +02:00
asus-laptop.c
atmel_pwm.c atmel_pwm: Rename the "mck" clock to "pwm_clk" 2008-06-27 15:32:30 +02:00
atmel_tclib.c
atmel-ssc.c
compal-laptop.c compal-laptop: remove unnecessary lcd_level attribute 2008-07-16 23:27:01 +02:00
eeepc-laptop.c eeepc-laptop: static 2008-07-16 23:27:01 +02:00
eeprom_93cx6.c
enclosure.c
fujitsu-laptop.c Fujitsu-laptop update 2008-07-16 23:27:01 +02:00
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
Kconfig HP iLO driver 2008-07-21 21:55:02 -07:00
kgdbts.c
lkdtm.c
Makefile HP iLO driver 2008-07-21 21:55:02 -07:00
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 sony-laptop: BKL pushdown 2008-07-02 15:06:25 -06:00
tc1100-wmi.c
thinkpad_acpi.c thinkpad-acpi: fix LED handling on older ThinkPads 2008-06-11 19:13:45 -04:00
tifm_7xx1.c
tifm_core.c