diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 13:26:37 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-06 13:26:37 -0700 |
commit | ce195d328485459b77672ef20485a8e4f21477b5 (patch) | |
tree | 60dacf394d6f002e41ee6b89561a2eea4dbee0ef /security/tomoyo | |
parent | 2560540b78b48c8050f56e8ff5903c11a4f7a16e (diff) | |
parent | 02b26774afebb2d62695ba3230319d70d8c6cc2d (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: Allow _put_sync() from interrupts-disabled context
PM / Domains: Fix pm_genpd_poweron()
Diffstat (limited to 'security/tomoyo')
0 files changed, 0 insertions, 0 deletions