Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2013 16:36:19 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Mar 2013 16:36:19 +0000 (09:36 -0700)
commitfa4a6732a8e6153435941cb730d7d54c8367fe72
treeb274e271df524ce1e472e57e8efee2420e6be3e4
parent368edaadc0f68712848d761c9bcbb12480b61a39
parent0da9dfdd2cd9889201bc6f6f43580c99165cd087
Merge branch 'for-linus' of git://git./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()