Merge branch 'misc' into test

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/acpi/Kconfig
Simple merge

diff --cc drivers/acpi/acpi_memhotplug.c
Simple merge

diff --cc drivers/acpi/asus_acpi.c
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/fan.c
Simple merge

diff --cc drivers/acpi/pci_link.c
Simple merge

diff --cc drivers/acpi/power.c
index 7ff7349,1bef942..e88edc0
--- 1/drivers/acpi/power.c
--- 2/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@@ -755,9 -733,9 +755,9 @@@ static int acpi_power_resume(struct acp
        if (!device || !acpi_driver_data(device))
                return -EINVAL;
  
-       resource = (struct acpi_power_resource *)acpi_driver_data(device);
+       resource = acpi_driver_data(device);
  
 -      result = acpi_power_get_state(resource, &state);
 +      result = acpi_power_get_state(device->handle, &state);
        if (result)
                return result;
  

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc drivers/acpi/video.c
Simple merge

diff --cc drivers/misc/eeepc-laptop.c
Simple merge

diff --cc drivers/misc/fujitsu-laptop.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge