]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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()


Trivial merge