Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Dec 2015 18:35:19 +0000 (10:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Dec 2015 18:35:19 +0000 (10:35 -0800)
Pull key handling bugfix from James Morris:
 "Fix a race between keyctl_read() and keyctl_revoke()"

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Fix race between read and revoke


Trivial merge