diff options
author | Linus Torvalds | 2011-06-09 00:58:51 +0200 |
---|---|---|
committer | Linus Torvalds | 2011-06-09 00:58:51 +0200 |
commit | 06e86849cf4019945a106913adb9ff0abcc01770 (patch) | |
tree | 97f041134a043f100398db5bddc4332a469245fa /security/apparmor/lsm.c | |
parent | vfs: reorganize 'struct inode' layout a bit (diff) | |
parent | PM / Runtime: Fix loops in pm_runtime_clk_notify() (diff) | |
download | kernel-qcow2-linux-06e86849cf4019945a106913adb9ff0abcc01770.tar.gz kernel-qcow2-linux-06e86849cf4019945a106913adb9ff0abcc01770.tar.xz kernel-qcow2-linux-06e86849cf4019945a106913adb9ff0abcc01770.zip |
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
Diffstat (limited to 'security/apparmor/lsm.c')
0 files changed, 0 insertions, 0 deletions