[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...

Signed-off-by: Len Brown <[email protected]>

diff --cc arch/i386/pci/irq.c
Simple merge

diff --cc arch/ia64/kernel/acpi.c
Simple merge

diff --cc arch/ia64/kernel/process.c
Simple merge

diff --cc arch/ia64/kernel/setup.c
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/processor_core.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/base/sys.c
Simple merge

diff --cc drivers/net/b44.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pcmcia/yenta_socket.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge

diff --cc include/acpi/acpi_drivers.h
Simple merge

diff --cc include/asm-alpha/pci.h
Simple merge

diff --cc include/asm-arm/pci.h
Simple merge

diff --cc include/asm-i386/apicdef.h
Simple merge

diff --cc include/asm-i386/pci.h
Simple merge

diff --cc include/asm-ia64/pci.h
Simple merge

diff --cc include/asm-mips/pci.h
Simple merge

diff --cc include/asm-ppc/pci.h
Simple merge

diff --cc include/asm-ppc64/pci.h
Simple merge

diff --cc include/asm-sh/pci.h
Simple merge

diff --cc include/asm-sh64/pci.h
Simple merge

diff --cc include/asm-sparc/pci.h
Simple merge

diff --cc include/asm-sparc64/pci.h
Simple merge

diff --cc include/asm-x86_64/pci.h
Simple merge

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/pm.h
Simple merge

diff --cc kernel/power/main.c
Simple merge