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 01:49:34 +0000 (18:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 May 2010 01:49:34 +0000 (18:49 -0700)
commit67bff7c087f91f79dfa97a33a3aeb147eb467093
tree6114aa6af653deee4b8098341c42ed3635b44c3f
parent7572e56314a7e2568f7196862222b45cfb9d6eda
parentcf8304e8f380903de3a15dc6ebd551c9e6cf1a21
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: Fix RCU handling in key_gc_keyring()
  KEYS: Fix an RCU warning in the reading of user keys