tree b274e271df524ce1e472e57e8efee2420e6be3e4
parent 368edaadc0f68712848d761c9bcbb12480b61a39
parent 0da9dfdd2cd9889201bc6f6f43580c99165cd087
author Linus Torvalds <torvalds@linux-foundation.org> 1363106179 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1363106179 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull key management race fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  keys: fix race with concurrent install_user_keyrings()