Merge branch 'linus' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:39:43 +0000 (03:39 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:39:43 +0000 (03:39 -0500)
commitb2576e1d4408e134e2188c967b1f28af39cd79d4
tree004f3c82faab760f304ce031d6d2f572e7746a50
parent3cc8a5f4ba91f67bbdb81a43a99281a26aab8d77
parent2150edc6c5cf00f7adb54538b9ea2a3e9cedca3f
Merge branch 'linus' into release
19 files changed:
Documentation/kernel-parameters.txt
arch/ia64/kernel/acpi.c
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/e820.c
drivers/acpi/acpica/acmacros.h
drivers/acpi/acpica/exprep.c
drivers/acpi/acpica/exresolv.c
drivers/acpi/acpica/exstore.c
drivers/acpi/acpica/rscreate.c
drivers/acpi/acpica/utobject.c
drivers/ata/libata-acpi.c
drivers/ide/ide-acpi.c
drivers/misc/Kconfig
drivers/pci/hotplug/acpi_pcihp.c
drivers/pci/hotplug/pciehp.h
drivers/pci/pci-acpi.c
include/acpi/actypes.h
include/linux/pci_hotplug.h
kernel/power/disk.c