| commit | 06e86849cf4019945a106913adb9ff0abcc01770 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 08 15:58:51 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 08 15:58:51 2011 -0700 |
| tree | 97f041134a043f100398db5bddc4332a469245fa | |
| parent | 13e12d14e2dccc7995b8f15a5678a338ab4e6a8c [diff] | |
| parent | 3b3eca3116861113ccc0e1ca3b98cb43598f46a7 [diff] |
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