projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2f7c3a1 dca6b41)
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)
commit159d08f4b85ce454cd05fb9e2c539276e148d366
tree0825ebc348dcb983f6a3ccebf0216aac92690343tree | snapshot
parent2f7c3a18a2dc79ddf7b83ae199b099a675e1adb2commit | diff
parentdca6b4149181baaa363b9a7ce7c550840bb3bc83commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

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
John Crispins staging tree