FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-23 18:07:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37224470c8
linux/drivers/acpi
History
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
..
dispatcher ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
events ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
executer ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
hardware ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
namespace ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
parser ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
resources ACPI: ACPICA 20060526 2006-06-14 02:44:35 -04:00
sleep Pull button into release branch 2006-06-15 23:17:14 -04:00
tables ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
utilities ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
ac.c [ACPI] Lindent all ACPI files 2005-08-05 00:45:14 -04:00
acpi_memhotplug.c ACPI: fix memory hotplug range length handling 2006-04-01 22:05:18 -05:00
asus_acpi.c Pull trivial2 into release branch 2006-06-15 21:31:17 -04:00
battery.c [ACPI] Lindent all ACPI files 2005-08-05 00:45:14 -04:00
blacklist.c [PATCH] x86_64: Clean up and tweak ACPI blacklist year code 2006-03-25 09:10:54 -08:00
bus.c Pull bugzilla-5000 into release branch 2006-06-15 21:36:11 -04:00
button.c [ACPI] Lindent all ACPI files 2005-08-05 00:45:14 -04:00
container.c [PATCH] driver core: replace "hotplug" by "uevent" 2006-01-04 16:18:08 -08:00
debug.c [ACPI] Lindent all ACPI files 2005-08-05 00:45:14 -04:00
ec.c Pull bugzilla-5764 into release branch 2006-06-15 21:34:21 -04:00
event.c [PATCH] Fix /proc/acpi/events around suspend 2005-10-17 17:03:57 -07:00
fan.c ACPI: create acpi_fan_suspend()/acpi_fan_resume() 2006-05-15 03:16:45 -04:00
glue.c [ACPI] ACPICA 20050930 2005-12-10 00:20:25 -05:00
hotkey.c [ACPI] drivers/acpi/hotkey.c: check kmalloc return value 2006-03-31 01:02:39 -05:00
ibm_acpi.c ACPI: Allow a WAN module enable/disable on a Thinkpad X60. 2006-06-01 20:42:32 -04:00
Kconfig 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
Makefile [ACPI] IA64 build: blacklist.c is used only on X86 2005-11-30 21:59:35 -05:00
motherboard.c ACPI: Display "ACPI" to motherboard resources in /proc/io{mem,port} 2006-04-01 21:33:00 -05:00
numa.c [PATCH] Unify pxm_to_node() and node_to_pxm() 2006-06-23 07:42:48 -07:00
osl.c ACPI: ACPICA 20060608 2006-06-14 02:45:47 -04:00
pci_bind.c [ACPI] add static to function definitions 2005-09-03 00:20:13 -04:00
pci_irq.c [ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica asus fops pnpacpi branches into release 2006-01-24 17:52:48 -05:00
pci_link.c 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
pci_root.c [ACPI] ACPICA 20050930 2005-12-10 00:20:25 -05:00
power.c [ACPI] Lindent all ACPI files 2005-08-05 00:45:14 -04:00
processor_core.c 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
processor_idle.c ACPI: apply "__read_mostly" to processor_idle.c loop module parameters and friends 2006-05-14 00:03:48 -04:00
processor_perflib.c ACPI: resolve merge conflict between sem2mutex and processor_perflib.c 2006-06-15 22:19:31 -04:00
processor_thermal.c [ACPI] make two processor functions static 2006-01-08 03:05:59 -05:00
processor_throttling.c [ACPI] make two processor functions static 2006-01-08 03:05:59 -05:00
scan.c Pull bugzilla-5000 into release branch 2006-06-15 21:36:11 -04:00
system.c ACPI: ACPICA 20060421 2006-06-14 02:30:55 -04:00
tables.c ACPI: ACPICA 20060331 2006-06-14 02:04:16 -04:00
thermal.c Pull bugzilla-5000 into release branch 2006-06-15 21:36:11 -04:00
toshiba_acpi.c [ACPI] Lindent all ACPI files 2005-08-05 00:45:14 -04:00
utils.c ACPI: fix potential memory leak in acpi_evaluate_integer() error path 2006-05-13 23:38:24 -04:00
video.c Pull video into release branch 2006-06-15 21:30:59 -04:00