]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 22:58:51 +0000 (15:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Jun 2011 22:58:51 +0000 (15:58 -0700)
commitcc6a4ff25461735a5e86b0340772f9a49b02af33
tree97f041134a043f100398db5bddc4332a469245fa
parentd4b8590d743fd1a58ee8753ed2d922f63329e934
parente4482e4e86831afb323c2da2baa0eda1813387f4
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Runtime: Fix loops in pm_runtime_clk_notify()
  PM / Intel IOMMU: Fix init_iommu_pm_ops() for CONFIG_PM unset