diff options
| author | Linus Torvalds <[email protected]> | 2011-02-12 00:16:03 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-02-12 00:16:03 +0000 |
| commit | f7909fb83550573300e72d120a7d97c9f6b53a65 (patch) | |
| tree | 20810edd4c137ce011b1ef7b751440a15d4088b7 /net/unix/af_unix.c | |
| parent | Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | pci: use security_capable() when checking capablities during config space read (diff) | |
| download | kernel-f7909fb83550573300e72d120a7d97c9f6b53a65.tar.gz kernel-f7909fb83550573300e72d120a7d97c9f6b53a65.zip | |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions