]> git.karo-electronics.de Git - karo-tx-linux.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)
commit06e86849cf4019945a106913adb9ff0abcc01770
tree97f041134a043f100398db5bddc4332a469245fa
parent13e12d14e2dccc7995b8f15a5678a338ab4e6a8c
parent3b3eca3116861113ccc0e1ca3b98cb43598f46a7
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