]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 23:26:46 +0000 (16:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 23:26:46 +0000 (16:26 -0700)
commit1600f9def09de07c5dbeb539e978fa73880690dd
treea8fa5c0891c68740543425d139414fec3d38b26e
parent11e39d993dc693e0bfc5521d367b2494cb3bcd38
parentb59ec78cdcc57e02bc3dddfa7134a2f0fd15c34d
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