| commit | 1600f9def09de07c5dbeb539e978fa73880690dd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 27 16:26:46 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 27 16:26:46 2010 -0700 |
| tree | a8fa5c0891c68740543425d139414fec3d38b26e | |
| 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