tree 6114aa6af653deee4b8098341c42ed3635b44c3f
parent 7572e56314a7e2568f7196862222b45cfb9d6eda
parent cf8304e8f380903de3a15dc6ebd551c9e6cf1a21
author Linus Torvalds <torvalds@linux-foundation.org> 1273024174 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1273024174 -0700

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: Fix RCU handling in key_gc_keyring()
  KEYS: Fix an RCU warning in the reading of user keys