Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 16:06:24 +0000 (09:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 16:06:24 +0000 (09:06 -0700)
commit5f233706592fcce7df57e12674461c349b8f591d
tree386c1817cb1be85e532e034a9b1cb98776c35c81
parent8777c793d6a24c7f3adf52b1b1086e9706de4589
parent896903c2f5f79f029388f033a00c3b813bc91201
Merge branch 'for-linus' of git://git./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: call_sbin_request_key() must write lock keyrings before modifying them
  KEYS: Use RCU dereference wrappers in keyring key type code
  KEYS: find_keyring_by_name() can gain access to a freed keyring