From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Nov 2011 22:33:02 +0000 (-0800)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: MMI-PSA29.97-13-9~17996
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2d360fcbd851b7f9f8c23b1c30b2f3c060fa43e6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/linux-pm

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Suspend: Fix bug in suspend statistics update
  PM / Hibernate: Fix the early termination of test modes
  PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset
  PM Sleep: Do not extend wakeup paths to devices with ignore_children set
  PM / driver core: disable device's runtime PM during shutdown
  PM / devfreq: correct Kconfig dependency
  PM / devfreq: fix use after free in devfreq_remove_device
  PM / shmobile: Avoid restoring the INTCS state during initialization
  PM / devfreq: Remove compiler error after irq.h update
  PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()
  PM / Clocks: Only disable enabled clocks in pm_clk_suspend()
  ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix
  PM / shmobile: Don't skip debugging output in pd_power_up()
---

2d360fcbd851b7f9f8c23b1c30b2f3c060fa43e6