Merge tag 'pm-for-3.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Sep 2012 19:59:42 +0000 (12:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Sep 2012 19:59:42 +0000 (12:59 -0700)
commit9bc67590a65a18201444c2d3d7dae3e897e700c2
tree6a10e6aaae15c7671b92b9e961ddd47060a87e7f
parent6167f81fd1054881d7476f57a8897ae4a477fa8b
parentf25b70613c048ceb1df052576fda03321ebf41cf
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