[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Len Brown [Tue, 12 Jul 2005 21:21:56 +0000 (17:21 -0400)]
Signed-off-by: Len Brown <len.brown@intel.com>

31 files changed:
1  2 
arch/i386/pci/irq.c
arch/ia64/kernel/acpi.c
arch/ia64/kernel/process.c
arch/ia64/kernel/setup.c
drivers/acpi/Kconfig
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/scan.c
drivers/base/sys.c
drivers/net/b44.c
drivers/pci/pci.c
drivers/pcmcia/yenta_socket.c
include/acpi/acpi_bus.h
include/acpi/acpi_drivers.h
include/asm-alpha/pci.h
include/asm-arm/pci.h
include/asm-i386/apicdef.h
include/asm-i386/pci.h
include/asm-ia64/pci.h
include/asm-mips/pci.h
include/asm-ppc/pci.h
include/asm-ppc64/pci.h
include/asm-sh/pci.h
include/asm-sh64/pci.h
include/asm-sparc/pci.h
include/asm-sparc64/pci.h
include/asm-x86_64/pci.h
include/linux/acpi.h
include/linux/device.h
include/linux/pm.h
kernel/power/main.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge