]> err.no Git - linux-2.6/commit
Merge linux-2.6 with linux-acpi-2.6
authorLen Brown <len.brown@intel.com>
Thu, 8 Sep 2005 05:45:47 +0000 (01:45 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 8 Sep 2005 05:45:47 +0000 (01:45 -0400)
commit64e47488c913ac704d465a6af86a26786d1412a5
treed3b0148592963dcde26e4bb35ddfec8b1eaf8e23
parent4a35a46bf1cda4737c428380d1db5d15e2590d18
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9
Merge linux-2.6 with linux-acpi-2.6
19 files changed:
arch/i386/Kconfig
arch/i386/kernel/Makefile
arch/i386/kernel/acpi/boot.c
arch/i386/kernel/io_apic.c
arch/i386/kernel/mpparse.c
arch/i386/kernel/setup.c
arch/i386/mach-es7000/es7000plat.c
arch/ia64/Kconfig
arch/x86_64/Kconfig
arch/x86_64/kernel/Makefile
arch/x86_64/kernel/genapic.c
arch/x86_64/kernel/io_apic.c
arch/x86_64/kernel/setup.c
drivers/char/hpet.c
drivers/char/ipmi/ipmi_si_intf.c
drivers/pnp/pnpacpi/rsparser.c
drivers/serial/Kconfig
include/asm-i386/mpspec.h
kernel/power/Kconfig