tree ae98aa0acb783c5f8e57bd29ca8ede44d569b444
parent c49d874bafd0a63379294ebd3531c41f9fcebc7d
parent 4f5f64cf0cc916220aaa055992e31195470cfe37
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1357337429 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1357337429 +0100

Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI / scan: Do not use dummy HID for system bus ACPI nodes
  ACPI / power: Remove useless message from device registering routine
  ACPI / glue: Update DBG macro to include KERN_DEBUG
  ACPI / PM: Do not apply ACPI_SUCCESS() to acpi_bus_get_device() result
  ACPI / memhotplug: remove redundant logic of acpi memory hotadd
  ACPI / APEI: Fix the returned value in erst_dbg_read