From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Thu, 13 Sep 2012 22:30:12 +0000 (+0200)
Subject: Merge branch 'pm-acpi-next' into linux-next
X-Git-Tag: next-20120914~42^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=21ebed0f1eee77a0f99d6f054712bcbd82211bd6;p=karo-tx-linux.git

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

* pm-acpi-next:
  ACPI / PM: Fix resource_lock dead lock in acpi_power_on_device
  ACPI / PM: Infer parent power state from child if unknown, v2
---

21ebed0f1eee77a0f99d6f054712bcbd82211bd6