From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Aug 2011 17:05:39 +0000 (-0700)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
X-Git-Tag: firefly_0821_release~3680^2~4547
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c11a7e26f8ee60bda0e64983291113ce5d04df55;p=firefly-linux-kernel-4.4.55.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:
  ARM: mach-shmobile: sh7372 LCDC1 suspend fix V2 (incremental)
  OMAP: omap_device: only override _noirq methods, not normal suspend/resume
  PM / Runtime: Correct documentation of pm_runtime_irq_safe()
  ARM: mach-shmobile: sh7372 LCDC1 suspend fix
  sh-sci / PM: Use power.irq_safe
  PM: Use spinlock instead of mutex in clock management functions
---

c11a7e26f8ee60bda0e64983291113ce5d04df55