diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:16:03 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-11 16:16:03 -0800 |
commit | f7909fb83550573300e72d120a7d97c9f6b53a65 (patch) | |
tree | 20810edd4c137ce011b1ef7b751440a15d4088b7 /block/blk-cgroup.c | |
parent | c41d40b53306434628b577715487810816fca885 (diff) | |
parent | 47970b1b2aa64464bc0a9543e86361a622ae7c03 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
pci: use security_capable() when checking capablities during config space read
security: add cred argument to security_capable()
tpm_tis: Use timeouts returned from TPM
Diffstat (limited to 'block/blk-cgroup.c')
0 files changed, 0 insertions, 0 deletions