Merge branch 'misc' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:38 +0000 (23:28 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:28:38 +0000 (23:28 -0400)
commit5f50ef453dcb05115fc98f244b8f10bfacd4b8b7
tree1999a7e6d242198d48f0089c7995a50f339fa3e4
parent530bc23bfeaa9156003afbeb9708fd03a5f1c73c
parente3deda9c87ac5eef2b5d18cd0b5511370979ca26
Merge branch 'misc' into test
14 files changed:
Documentation/kernel-parameters.txt
drivers/acpi/Kconfig
drivers/acpi/acpi_memhotplug.c
drivers/acpi/asus_acpi.c
drivers/acpi/ec.c
drivers/acpi/fan.c
drivers/acpi/pci_link.c
drivers/acpi/power.c
drivers/acpi/scan.c
drivers/acpi/thermal.c
drivers/acpi/video.c
drivers/misc/eeepc-laptop.c
drivers/misc/fujitsu-laptop.c
include/acpi/acpi_bus.h