tree 78bf945aa5502093cbee291dc35117a07ab09da2
parent 219f358e0ba9a98640341e030533089860af1cc6
parent d0168fdc7a1301c8139eb63a465038f63e342b39
author Linus Torvalds <torvalds@linux-foundation.org> 1314551139 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314551139 -0700

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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