Linus Torvalds 37224470c8 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 ... * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits) ACPI: suppress power button event on S3 resume ACPI: resolve merge conflict between sem2mutex and processor_perflib.c ACPI: use for_each_possible_cpu() instead of for_each_cpu() ACPI: delete newly added debugging macros in processor_perflib.c ACPI: UP build fix for bugzilla-5737 Enable P-state software coordination via _PDC P-state software coordination for speedstep-centrino P-state software coordination for acpi-cpufreq P-state software coordination for ACPI core ACPI: create acpi_thermal_resume() ACPI: create acpi_fan_suspend()/acpi_fan_resume() ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend() ACPI: create acpi_device_suspend()/acpi_device_resume() ACPI: replace spin_lock_irq with mutex for ec poll mode ACPI: Allow a WAN module enable/disable on a Thinkpad X60. sem2mutex: acpi, acpi_link_lock ACPI: delete unused acpi_bus_drivers_lock sem2mutex: drivers/acpi/processor_perflib.c ACPI add ia64 exports to build acpi_memhotplug as a module ACPI: asus_acpi_init(): propagate correct return value ... Manual resolve of conflicts in: arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c include/acpi/processor.h		2006-06-23 07:52:36 -07:00
..
cpufreq	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2006-06-23 07:52:36 -07:00
mcheck	[PATCH] Don't pass boot parameters to argv_init[]	2006-03-31 12:18:53 -08:00
mtrr	[PATCH] sem2mutex: misc static one-file mutexes	2006-03-26 08:56:55 -08:00
amd.c	[PATCH] i386/x86-64: Fix x87 information leak between processes	2006-04-20 07:58:11 -07:00
centaur.c	[PATCH] Fix the imlicit declaration of mtrr_centaur_report_mcr in arch/i386/kernel/cpu/centaur.c	2006-03-23 07:38:06 -08:00
common.c	[PATCH] Don't trigger full rebuild via CONFIG_X86_MCE	2006-06-23 07:42:56 -07:00
cpu.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
cyrix.c	[PATCH] x86: cyrix code CONFIG_PCI fix / add __initdata	2006-06-23 07:42:57 -07:00
intel_cacheinfo.c	[PATCH] Remove __devinit and __cpuinit from notifier_call definitions	2006-04-26 08:30:03 -07:00
intel.c	[PATCH] i386: __devinit should be __cpuinit	2006-03-23 07:38:04 -08:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
nexgen.c	[PATCH] i386 cpu hotplug: don't access freed memory	2006-02-05 11:06:53 -08:00
proc.c	[PATCH] x86: VIA C7 CPU flags	2006-06-23 07:42:59 -07:00
rise.c	[PATCH] i386 cpu hotplug: don't access freed memory	2006-02-05 11:06:53 -08:00
transmeta.c	[PATCH] x86_64: Add boot option to disable randomized mappings and cleanup	2006-02-17 08:00:40 -08:00
umc.c	[PATCH] i386 cpu hotplug: don't access freed memory	2006-02-05 11:06:53 -08:00