Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2016 16:15:19 +0000 (09:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2016 16:15:19 +0000 (09:15 -0700)
Pull Yama locking fix from James Morris:
 "Fix for the Yama LSM"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Yama: fix double-spinlock and user access in atomic context


Trivial merge