Merge branch 'acpi-cleanup-next' into linux-next

* acpi-cleanup-next:
  ACPI / dock: Drop unnecessary local variable from dock_add()
  ACPI / dock / PCI: Drop ACPI dock notifier chain
  ACPI / dock: Do not check CONFIG_ACPI_DOCK_MODULE
  ACPI / dock: Do not leak memory on falilures to add a dock station
  ACPI: Drop ACPI bus notifier call chain
  ACPI / dock: Rework the handling of notifications
  ACPI / dock: Simplify dock_init_hotplug() and dock_release_hotplug()
  ACPI / dock: Walk list in reverse order during removal of devices
  ACPI / dock: Rework and simplify find_dock_devices()
  ACPI / dock: Drop the hp_lock mutex from struct dock_station
  ACPI: simplify acpiphp driver with new helper functions
  ACPI: simplify dock driver with new helper functions
  ACPI: Export acpi_(bay)|(dock)_match() from scan.c
  ACPI: introduce two helper functions for _EJ0 and _LCK
  ACPI: introduce helper function acpi_execute_simple_method()
  ACPI: introduce helper function acpi_has_method()
  ACPI / dock: simplify dock_create_acpi_device()
  ACPI / dock: mark initialization functions with __init
  ACPI / dock: drop redundant spin lock in dock station object
  ACPI / dock: avoid initializing acpi_dock_notifier_list multiple times

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

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

diff --cc drivers/acpi/video.c
index fd749a0578e0b36e28762f9225d4f2b7d25733f1,b862c7f7494197164387a614df9eb74562173515..3c39e153493619ed0a5aaf0cb599616732a2aae7
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -896,14 -881,10 +883,13 @@@ static void acpi_video_device_find_cap(
                device->cap._BCQ = 1;
        }
  
-       if (ACPI_SUCCESS(acpi_get_handle(device->dev->handle, "_DDC", &h_dummy1))) {
+       if (acpi_has_method(device->dev->handle, "_DDC"))
                device->cap._DDC = 1;
-       }
  
 -      if (acpi_video_backlight_support()) {
 +      if (acpi_video_init_brightness(device))
 +              return;
 +
 +      if (acpi_video_verify_backlight_support()) {
                struct backlight_properties props;
                struct pci_dev *pdev;
                acpi_handle acpi_parent;

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