diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 16:26:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-27 16:26:46 -0700 |
commit | 1600f9def09de07c5dbeb539e978fa73880690dd (patch) | |
tree | a8fa5c0891c68740543425d139414fec3d38b26e /include/net | |
parent | 11e39d993dc693e0bfc5521d367b2494cb3bcd38 (diff) | |
parent | b59ec78cdcc57e02bc3dddfa7134a2f0fd15c34d (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:
keys: don't need to use RCU in keyring_read() as semaphore is held
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions