http://linux-acpi.bkbits.net/linux-acpi-test-mm
len.brown@intel.com|ChangeSet|20041224052434|55142 len.brown
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/12/29 17:44:48-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi
#
# drivers/Makefile
# 2004/12/29 17:44:44-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/kernel/setup.c
# 2004/12/29 17:44:44-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/12/29 17:44:44-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/27 00:07:14-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi
#
# drivers/Makefile
# 2004/12/27 00:07:06-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/24 00:24:34-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/acpi/pci_irq.c
# 2004/12/24 00:24:26-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/22 11:25:33-08:00 akpm@bix.(none)
# Merge http://linux-acpi.bkbits.net/linux-acpi-test-mm
# into bix.(none):/usr/src/bk-acpi
#
# arch/x86_64/Kconfig
# 2004/12/22 11:25:28-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/ia64/kernel/setup.c
# 2004/12/22 11:25:28-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/12/22 11:25:28-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/12/22 11:25:28-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/22 01:19:57-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/acpi/processor_core.c
# 2004/12/22 01:19:54-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/21 23:44:25-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/acpi/processor_core.c
# 2004/12/21 23:44:21-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor_core.c
# 2004/12/21 23:44:21-05:00 len.brown@intel.com +0 -0
# Merge rename: drivers/acpi/processor.c -> drivers/acpi/processor_core.c
#
# drivers/acpi/Makefile
# 2004/12/21 23:44:21-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/20 22:12:32-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-i386/acpi.h
# 2004/12/20 22:12:28-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/Kconfig
# 2004/12/20 22:12:28-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/setup.c
# 2004/12/20 22:12:28-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/12/20 22:12:27-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/12/20 22:12:27-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/17 12:43:03-08:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-acpi
#
# arch/ia64/kernel/setup.c
# 2004/12/17 12:42:58-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/16 12:20:02-08:00 akpm@bix.(none)
# Merge http://linux-acpi.bkbits.net/linux-acpi-test-mm
# into bix.(none):/usr/src/bk-acpi
#
# arch/x86_64/Kconfig
# 2004/12/16 12:19:56-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/12/16 12:19:56-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/12/16 12:19:56-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/06 16:08:50-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-hotplug
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/linux/acpi.h
# 2004/12/06 16:08:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor.c
# 2004/12/06 16:08:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/pci_irq.c
# 2004/12/06 16:08:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/bus.c
# 2004/12/06 16:08:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/12/06 16:08:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/12/06 16:08:38-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/12/01 11:27:11-05:00 len.brown@intel.com
# fix merge error specific to the mm tree, which resulted in a build warning
# in drivers/char/ipmi/ipmi_si_intf.c
#
# drivers/char/ipmi/ipmi_si_intf.c
# 2004/12/01 11:27:03-05:00 len.brown@intel.com +3 -1
# fix merge error specific to the mm tree, which resulted in a build warning.
#
# ChangeSet
# 2004/12/01 02:39:43-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-i386/io_apic.h
# 2004/12/01 02:39:39-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-i386/acpi.h
# 2004/12/01 02:39:39-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/char/ipmi/ipmi_si_intf.c
# 2004/12/01 02:39:39-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/mpparse.c
# 2004/12/01 02:39:39-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/12/01 02:39:39-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/30 21:59:51-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-hotplug
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-x86_64/io_apic.h
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/scan.c
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/pci_irq.c
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/bus.c
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Makefile
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/io_apic.c
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/setup.c
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# BitKeeper/deleted/.del-acpi_ksyms.c~3e52a41ca5aed029
# 2004/11/30 21:59:46-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# BitKeeper/deleted/.del-acpi_ksyms.c~3e52a41ca5aed029
# 2004/11/30 21:59:45-05:00 len.brown@intel.com +0 -0
# Merge rename: drivers/acpi/acpi_ksyms.c -> BitKeeper/deleted/.del-acpi_ksyms.c~3e52a41ca5aed029
#
# ChangeSet
# 2004/11/11 03:42:08-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-i386/acpi.h
# 2004/11/11 03:42:04-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/11/11 03:42:04-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/Makefile
# 2004/11/11 03:42:04-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/11 02:58:05-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-hotplug
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/linux/acpi.h
# 2004/11/11 02:58:02-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/scan.c
# 2004/11/11 02:58:02-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor.c
# 2004/11/11 02:58:02-05:00 len.brown@intel.com +0 -5
# Auto merged
#
# drivers/acpi/pci_irq.c
# 2004/11/11 02:58:01-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/bus.c
# 2004/11/11 02:58:01-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/11/11 02:58:01-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/11 02:35:00-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-i386/acpi.h
# 2004/11/11 02:34:56-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/11/11 02:34:56-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/Makefile
# 2004/11/11 02:34:56-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/10 18:30:19-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-i386/acpi.h
# 2004/11/10 18:30:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/scan.c
# 2004/11/10 18:30:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor.c
# 2004/11/10 18:30:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/11/10 18:30:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/11/10 18:30:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/11/10 18:30:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/09 04:12:53-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-i386/acpi.h
# 2004/11/09 04:12:50-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/pci_irq.c
# 2004/11/09 04:12:50-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/mpparse.c
# 2004/11/09 04:12:50-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/08 15:53:36-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# arch/x86_64/kernel/Makefile
# 2004/11/08 15:53:27-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/11/08 15:53:27-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/05 23:13:12-05:00 len.brown@intel.com
# merge
#
# include/linux/acpi.h
# 2004/11/05 23:13:06-05:00 len.brown@intel.com +9 -8
# merge
#
# drivers/acpi/processor.c
# 2004/11/05 23:13:05-05:00 len.brown@intel.com +5 -4
# merge
#
# arch/x86_64/kernel/setup.c
# 2004/11/05 23:07:24-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/Makefile
# 2004/11/05 23:07:24-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/11/05 23:07:24-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/11/05 23:07:24-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/11/02 03:52:41-05:00 len.brown@intel.com
# Merge
#
# drivers/acpi/scan.c
# 2004/11/02 03:52:39-05:00 len.brown@intel.com +0 -0
# SCCS merged
#
# include/asm-x86_64/mpspec.h
# 2004/11/02 03:43:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor.c
# 2004/11/02 03:43:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/bus.c
# 2004/11/02 03:43:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/mpparse.c
# 2004/11/02 03:43:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/io_apic.c
# 2004/11/02 03:43:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/Makefile
# 2004/11/02 03:43:15-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/11/02 03:43:14-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/Makefile
# 2004/11/02 03:43:14-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/11/02 03:43:14-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/31 01:17:23-05:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-hotplug
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/acpi/processor.c
# 2004/10/31 01:17:19-05:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/28 05:02:07-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-hotplug
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/linux/acpi.h
# 2004/10/28 05:02:03-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/acpi/acpi_bus.h
# 2004/10/28 05:02:03-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor.c
# 2004/10/28 05:02:02-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/10/28 05:01:56-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/28 04:05:58-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-hotplug
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/linux/acpi.h
# 2004/10/28 04:05:54-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/acpi/acpi_drivers.h
# 2004/10/28 04:05:54-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/acpi/acpi_bus.h
# 2004/10/28 04:05:54-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor.c
# 2004/10/28 04:05:54-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/acpi_ksyms.c
# 2004/10/28 04:05:54-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Makefile
# 2004/10/28 04:05:54-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Kconfig
# 2004/10/28 04:05:53-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/acpi.c
# 2004/10/28 04:05:53-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/10/28 04:05:53-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/26 02:34:54-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/acpi/acpi_bus.h
# 2004/10/26 02:34:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Makefile
# 2004/10/26 02:34:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Kconfig
# 2004/10/26 02:34:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/Makefile
# 2004/10/26 02:34:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/Makefile
# 2004/10/26 02:34:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/10/26 02:34:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/Makefile
# 2004/10/26 02:34:49-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/23 02:53:12-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# sound/drivers/mpu401/mpu401.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-x86_64/mpspec.h
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-x86_64/acpi.h
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-i386/mpspec.h
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/char/ipmi/ipmi_si_intf.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/processor.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Makefile
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Kconfig
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/Makefile
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/setup.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/mpparse.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/io_apic.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/Kconfig
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/acpi.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/mpparse.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/10/23 02:47:28-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/10/23 02:47:27-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/10/23 02:47:27-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/19 13:36:18-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/acpi/processor.c
# 2004/10/19 13:36:14-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/10/19 13:36:14-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/19 12:22:10-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# include/asm-i386/io_apic.h
# 2004/10/19 12:22:03-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/setup.c
# 2004/10/19 12:22:03-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/Makefile
# 2004/10/19 12:22:03-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/Kconfig
# 2004/10/19 12:22:03-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/10/19 12:22:02-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/10/19 12:22:02-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/14 14:05:31-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/26-latest-mm
#
# arch/i386/kernel/io_apic.c
# 2004/10/14 14:05:27-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/10 04:34:32-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-dominik
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/acpi/acpi_ksyms.c
# 2004/10/10 04:34:29-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/08 18:51:45-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-dev
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/acpi/Kconfig
# 2004/10/08 18:51:41-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/setup.c
# 2004/10/08 18:51:41-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/08 18:44:00-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/src/26-latest-dominik
# into intel.com:/home/lenb/bk/26-latest-mm
#
# arch/x86_64/kernel/io_apic.c
# 2004/10/08 18:43:56-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/10/08 18:43:56-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/10/08 18:01:04-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-ref
# into intel.com:/home/lenb/bk/26-latest-mm
#
# drivers/Makefile
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/setup.c
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/io_apic.c
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/Kconfig
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/setup.c
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/acpi.c
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/setup.c
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# Documentation/kernel-parameters.txt
# 2004/10/08 18:01:00-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/17 00:29:39-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/linux-acpi-test-mm
#
# drivers/Makefile
# 2004/09/17 00:29:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/Kconfig
# 2004/09/17 00:29:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/09/17 00:29:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/09/17 00:29:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/10 16:26:55-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/linux-acpi-test-mm
#
# include/asm-x86_64/mpspec.h
# 2004/09/10 16:26:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/Makefile
# 2004/09/10 16:26:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/setup.c
# 2004/09/10 16:26:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/ia64/kernel/acpi.c
# 2004/09/10 16:26:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/02 03:39:43-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/linux-acpi-test-mm
#
# include/linux/acpi.h
# 2004/09/02 03:39:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/acpi/acpi_drivers.h
# 2004/09/02 03:39:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/acpi/Kconfig
# 2004/09/02 03:39:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/io_apic.c
# 2004/09/02 03:39:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/09/02 03:39:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/dmi_scan.c
# 2004/09/02 03:39:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/09/02 03:39:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/02 03:25:49-04:00 len.brown@intel.com
# merge
#
# arch/x86_64/Kconfig
# 2004/09/02 03:25:42-04:00 len.brown@intel.com +1 -0
# merge
#
# sound/drivers/mpu401/mpu401.c
# 2004/09/02 03:20:35-04:00 len.brown@intel.com +3 -3
# Auto merged
#
# include/asm-x86_64/mpspec.h
# 2004/09/02 03:20:35-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-x86_64/acpi.h
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-i386/fixmap.h
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-i386/acpi.h
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/char/ipmi/ipmi_si_intf.c
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +1 -2
# Auto merged
#
# drivers/Makefile
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/setup.c
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/Makefile
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/setup.c
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/Makefile
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/09/02 03:20:34-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/02 03:00:54-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/linux-acpi-test-mm
#
# sound/drivers/mpu401/mpu401.c
# 2004/09/02 03:00:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/setup.c
# 2004/09/02 03:00:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/09/02 03:00:50-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/Makefile
# 2004/09/02 03:00:49-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/09/01 20:28:43-04:00 len.brown@intel.com
# Cset exclude: len.brown@intel.com|ChangeSet|20040817220851|52337
#
# arch/i386/kernel/dmi_scan.c
# 2004/09/01 20:28:41-04:00 len.brown@intel.com +0 -0
# Exclude
#
# ChangeSet
# 2004/09/01 20:26:54-04:00 len.brown@intel.com
# Cset exclude: len.brown@intel.com|ChangeSet|20040826050001|40089
#
# sound/drivers/mpu401/mpu401.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/linux/acpi.h
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/asm-i386/mpspec.h
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/asm-i386/io_apic.h
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/asm-i386/fixmap.h
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# drivers/acpi/acpi_ksyms.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# drivers/acpi/Makefile
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# drivers/acpi/Kconfig
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# drivers/Makefile
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/x86_64/Kconfig
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/ia64/kernel/setup.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/ia64/kernel/acpi.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/kernel/setup.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/kernel/mpparse.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/kernel/io_apic.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/kernel/dmi_scan.c
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/kernel/acpi/Makefile
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/kernel/Makefile
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/Kconfig
# 2004/09/01 20:26:43-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/asm-x86_64/mpspec.h
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/asm-x86_64/io_apic.h
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/asm-x86_64/acpi.h
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/asm-i386/acpi.h
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/acpi/acpi_drivers.h
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# include/acpi/acpi_bus.h
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# drivers/char/ipmi/ipmi_si_intf.c
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/x86_64/kernel/setup.c
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/x86_64/kernel/mpparse.c
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/x86_64/kernel/io_apic.c
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/x86_64/kernel/acpi/Makefile
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/x86_64/kernel/Makefile
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# arch/i386/kernel/acpi/boot.c
# 2004/09/01 20:26:42-04:00 len.brown@intel.com +0 -0
# Exclude
#
# ChangeSet
# 2004/08/27 01:25:27-04:00 len.brown@intel.com
# Merge intel.com:/home/lenb/bk/26-latest-test
# into intel.com:/home/lenb/bk/linux-acpi-test-mm
#
# include/asm-i386/acpi.h
# 2004/08/27 01:25:23-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/acpi/boot.c
# 2004/08/27 01:25:23-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/Makefile
# 2004/08/27 01:25:23-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/26 01:04:55-04:00 len.brown@intel.com
# merge
#
# arch/x86_64/Kconfig
# 2004/08/26 01:04:50-04:00 len.brown@intel.com +0 -1
# merge
#
# include/asm-x86_64/mpspec.h
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-x86_64/acpi.h
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-i386/fixmap.h
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# include/asm-i386/acpi.h
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# drivers/char/ipmi/ipmi_si_intf.c
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -3
# Auto merged
#
# drivers/Makefile
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/setup.c
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/x86_64/kernel/Makefile
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/io_apic.c
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/kernel/Makefile
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
# arch/i386/Kconfig
# 2004/08/26 01:01:12-04:00 len.brown@intel.com +0 -0
# Auto merged
#
diff -Nru a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
--- a/arch/x86_64/Kconfig 2005-01-02 23:04:34 -08:00
+++ b/arch/x86_64/Kconfig 2005-01-02 23:04:34 -08:00
@@ -170,7 +170,7 @@
bool
depends on SMP && !MK8
default y
-
+
config MATH_EMULATION
bool
diff -Nru a/include/linux/acpi.h b/include/linux/acpi.h
--- a/include/linux/acpi.h 2005-01-02 23:04:34 -08:00
+++ b/include/linux/acpi.h 2005-01-02 23:04:34 -08:00
@@ -479,6 +479,15 @@
#endif /*!CONFIG_ACPI_INTERPRETER*/
+#ifdef CONFIG_ACPI_NUMA
+int acpi_get_pxm(acpi_handle handle);
+#else
+static inline int acpi_get_pxm(acpi_handle handle)
+{
+ return 0;
+}
+#endif
+
#define ACPI_CSTATE_LIMIT_DEFINED /* for driver builds */
#ifdef CONFIG_ACPI
@@ -505,12 +514,4 @@
static inline void acpi_set_cstate_limit(unsigned int new_limit) { return; }
#endif
-#ifdef CONFIG_ACPI_NUMA
-int acpi_get_pxm(acpi_handle handle);
-#else
-static inline int acpi_get_pxm(acpi_handle handle)
-{
- return 0;
-}
-#endif
#endif /*_LINUX_ACPI_H*/