Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzi...
authorLen Brown <len.brown@intel.com>
Wed, 24 Jun 2009 05:19:50 +0000 (01:19 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 24 Jun 2009 05:19:50 +0000 (01:19 -0400)
commitfbe8cddd2d85979d273d7937a2b8a47498694d91
tree2ae3253bfd89337583d36afd783145786ffa531e
parent4e8a2372f9255a1464ef488ed925455f53fbdaa1
parente86435eb91b2bff114c5a02e46e16ce21b647ebe
parent7fe2a6c275a5bcec52fb3ef643daaf8265b7af0d
parent0705495d9010048e293013d9d129cf723363a0a8
parent35a7c64fbc77bab4ca8ae477e8ab278ccd679ce2
parent152a4e630f7ffdd7ff64427c4ba488dc0bce76af
parent86e437f077c68112edcb6854ec036ed7e3f9a7f3
parentc8d72a5e76988140bfdfd8722f2228d94e7fa10f
parent7a04b8491a077471a34938b8ca060c37220953be
parentee1ca48fae7e575d5e399d4fdcfe0afc1212a64c
parent9eccbc2f67efd0d19c47f40182abf2965c287add
parent7e275cc4e8e20f82740bf40ae2f5695e9e35ff09
parent7b768f07dce463a054c9dd84862d15ccc3d2b712
parent8cb24c8fd70ea8431744de1ca0ca34ab45fbbdaa
parent113b3a2b901573961509e81a28e9546cf9defef0
parentd73772474f6ebbacbe820c31c0fa1cffa7160246
parent056c308d3e4859334b519033d62ef050f0e0e261
parent871043bc463e7d191e7b5b00436a8852921dd833
Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzilla-13121', 'bugzilla-13396', 'bugzilla-13533', 'bugzilla-13612', 'c3_lock', 'hid-cleanups', 'misc-2.6.31', 'pdc-leak-fix', 'pnpacpi', 'power_nocheck', 'thinkpad_acpi', 'video' and 'wmi' into release
20 files changed:
Documentation/kernel-parameters.txt
Documentation/laptops/thinkpad-acpi.txt
MAINTAINERS
arch/x86/include/asm/pci_x86.h
arch/x86/kernel/acpi/boot.c
drivers/acpi/pci_irq.c
drivers/acpi/pci_root.c
drivers/acpi/processor_core.c
drivers/acpi/processor_idle.c
drivers/acpi/scan.c
drivers/acpi/video.c
drivers/platform/x86/Kconfig
drivers/platform/x86/hp-wmi.c
drivers/platform/x86/thinkpad_acpi.c
drivers/pnp/pnpacpi/rsparser.c
include/acpi/acpi_bus.h
include/acpi/acpi_drivers.h
include/linux/acpi.h
include/linux/pci_hotplug.h
init/main.c