Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Aug 2015 18:00:53 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Aug 2015 18:00:53 +0000 (11:00 -0700)
commit665aadc1d69e6f98c01194531fa558224545ce22
tree9e5401425920f429f2da1b3826ee4bfb53c88591
parentabeb4f572d1c4e3c996a427c19e52601dee044e8
parent5413fcdbe9e7ca32ce3f00fd5251dfa560b7484b
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull security layer fix from James Morris:
 "Yama initialization fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Adding YAMA hooks also when YAMA is not stacked.