kevin/linux
1
Fork 0
Code
685143ac1f
linux/drivers/acpi
History
Linus Torvalds 81a07d7588 Merge branch 'x86-64' 
* x86-64: (83 commits)
  [PATCH] x86_64: x86_64 stack usage debugging
  [PATCH] x86_64: (resend) x86_64 stack overflow debugging
  [PATCH] x86_64: msi_apic.c build fix
  [PATCH] x86_64: i386/x86-64 Add nmi watchdog support for new Intel CPUs
  [PATCH] x86_64: Avoid broadcasting NMI IPIs
  [PATCH] x86_64: fix apic error on bootup
  [PATCH] x86_64: enlarge window for stack growth
  [PATCH] x86_64: Minor string functions optimizations
  [PATCH] x86_64: Move export symbols to their C functions
  [PATCH] x86_64: Standardize i386/x86_64 handling of NMI_VECTOR
  [PATCH] x86_64: Fix modular pc speaker
  [PATCH] x86_64: remove sys32_ni_syscall()
  [PATCH] x86_64: Do not use -ffunction-sections for modules
  [PATCH] x86_64: Add cpu_relax to apic_wait_icr_idle
  [PATCH] x86_64: adjust kstack_depth_to_print default
  [PATCH] i386/x86-64: adjust /proc/interrupts column headings
  [PATCH] x86_64: Fix race in cpu_local_* on preemptible kernels
  [PATCH] x86_64: Fix fast check in safe_smp_processor_id
  [PATCH] x86_64: x86_64 setup.c - printing cmp related boottime information
  [PATCH] i386/x86-64/ia64: Move polling flag into thread_info_status
  ...

Manual resolve of trivial conflict in arch/i386/kernel/Makefile
2006-06-26 10:51:09 -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_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
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
container.c [PATCH] driver core: replace "hotplug" by "uevent" 2006-01-04 16:18:08 -08:00
debug.c
ec.c Pull bugzilla-5764 into release branch 2006-06-15 21:34:21 -04:00
event.c
fan.c ACPI: create acpi_fan_suspend()/acpi_fan_resume() 2006-05-15 03:16:45 -04:00
glue.c
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
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
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
power.c
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 Merge branch 'x86-64' 2006-06-26 10:51:09 -07: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
utils.c ACPI: fix potential memory leak in acpi_evaluate_integer() error path 2006-05-13 23:38:24 -04:00
video.c [PATCH] fix typo in acpi video brightness changes. 2006-06-23 21:37:34 -07:00