tree 1352c0be04d06620d7ecfe8b027ee84c2397206f
parent 31880c37c11e28cb81c70757e38392b42e695dc6
parent fd4655c259fa91b3b207345eb7b4d9faa1b6bc8d
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1365417083 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1365417083 +0200

Merge branch 'acpi-hotplug' into linux-next

* acpi-hotplug:
  ACPI / memhotplug: Remove info->failed bit
  ACPI / memhotplug: set info->enabled for memory present at boot time
  ACPI: Verify device status after eject
  acpi: remove reference to ACPI_HOTPLUG_IO
  ACPI: Update _OST handling for notify
  ACPI: Update PNPID match handling for notify
  ACPI: Update PNPID set/free interfaces
  ACPI: Remove acpi_device dependency in acpi_device_set_id()
  ACPI / hotplug: Make acpi_hotplug_profile_ktype static
  ACPI / scan: Make memory hotplug driver use struct acpi_scan_handler
  ACPI / container: Use hotplug profile user space interface
  ACPI / hotplug: Introduce user space interface for hotplug profiles
  ACPI / scan: Introduce acpi_scan_handler_matching()
  ACPI / container: Use common hotplug code
  ACPI / scan: Introduce common code for ACPI-based device hotplug
  ACPI / scan: Introduce acpi_scan_match_handler()