From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 4 Jan 2013 22:10:29 +0000 (+0100)
Subject: Merge branch 'acpi-assorted'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f3fe8bd7b114d88c802616a98a0cf69299c37ed3;p=deliverable%2Flinux.git

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
---

f3fe8bd7b114d88c802616a98a0cf69299c37ed3