]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 239f0b1 ecb7955)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2016 18:14:00 +0000 (11:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2016 18:14:00 +0000 (11:14 -0700)
commitb0b533b8911ed1a3bc45d0197e82d326a29fa3d9
tree80a19f6ab582122f8d8f85256a2869f3a83e9edftree | snapshot
parent239f0b16b1d6301e47e85c26230c7df262ef22f7commit | diff
parentecb79552a35c9c6ee520d0d6381f23ddfd6b9b79commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull IMA fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ima: fix the string representation of the LSM/IMA hook enumeration ordering
Linux Kernel Source Tree.