From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 5 May 2010 16:06:24 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v2.6.34-rc7~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f233706592fcce7df57e12674461c349b8f591d;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

5f233706592fcce7df57e12674461c349b8f591d