From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Sep 2012 19:59:42 +0000 (-0700)
Subject: Merge tag 'pm-for-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v3.6-rc6~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bc67590a65a18201444c2d3d7dae3e897e700c2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge tag 'pm-for-3.6-rc6' of git://git./linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael J. Wysocki:
 "Three ACPI device power management fixes related to checking and
  setting device power states."

* tag 'pm-for-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / PM: Use KERN_DEBUG when no power resources are found
  ACPI / PM: Fix resource_lock dead lock in acpi_power_on_device
  ACPI / PM: Infer parent power state from child if unknown, v2
---

9bc67590a65a18201444c2d3d7dae3e897e700c2