Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Tue, 26 Oct 2010 18:51:00 +0000 (14:51 -0400)
committerLen Brown <len.brown@intel.com>
Tue, 26 Oct 2010 18:51:00 +0000 (14:51 -0400)
commit7e31842441776b4d6ec7fd916c91663ad05b7814
tree8d97d41b4f6861dcbc0dc3ac96fab7afddbed731
parent1bd64d42abdd4f9d44f77011a31f0292112f4c3b
parentb1d248d96c71665c79befb81207f38f894c7c082
Merge branch 'misc' into release
MAINTAINERS
drivers/acpi/Kconfig
drivers/acpi/dock.c
drivers/acpi/osl.c
drivers/acpi/processor_driver.c
drivers/acpi/sleep.c
include/acpi/acpiosxf.h
include/linux/acpi.h