kernel-ark/include/acpi
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
..
platform 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
acconfig.h ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
acdebug.h
acdisasm.h ACPI: ACPICA 20060512 2006-06-14 02:34:48 -04:00
acdispat.h ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
acevents.h ACPI: ACPICA 20060512 2006-06-14 02:34:48 -04:00
acexcep.h ACPI: ACPICA 20060421 2006-06-14 02:30:55 -04:00
acglobal.h ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
achware.h
acinterp.h
aclocal.h ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
acmacros.h ACPI: ACPICA 20060512 2006-06-14 02:34:48 -04:00
acnames.h
acnamesp.h ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
acobject.h ACPI: ACPICA 20060421 2006-06-14 02:30:55 -04:00
acopcode.h ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
acoutput.h ACPI: ACPICA 20060421 2006-06-14 02:30:55 -04:00
acparser.h ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
acpi_bus.h Pull bugzilla-5000 into release branch 2006-06-15 21:36:11 -04:00
acpi_drivers.h
acpi_numa.h [PATCH] Unify pxm_to_node() and node_to_pxm() 2006-06-23 07:42:48 -07:00
acpi.h
acpiosxf.h ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
acpixf.h [ACPI] ACPICA 20060317 2006-06-14 01:22:20 -04:00
acresrc.h ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
acstruct.h ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
actables.h ACPI: ACPICA 20060331 2006-06-14 02:04:16 -04:00
actbl1.h ACPI: ACPICA 20060331 2006-06-14 02:04:16 -04:00
actbl2.h ACPI: ACPICA 20060331 2006-06-14 02:04:16 -04:00
actbl71.h
actbl.h ACPI: ACPICA 20060512 2006-06-14 02:34:48 -04:00
actypes.h ACPI: ACPICA 20060512 2006-06-14 02:34:48 -04:00
acutils.h ACPI: ACPICA 20060421 2006-06-14 02:30:55 -04:00
amlcode.h ACPI: ACPICA 20060512 2006-06-14 02:34:48 -04:00
amlresrc.h ACPI: ACPICA 20060512 2006-06-14 02:34:48 -04:00
container.h
pdc_intel.h Enable P-state software coordination via _PDC 2006-02-09 03:21:49 -05:00
processor.h 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