]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2d785d8 73da93a)
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)
commit3e7ec868a83c4f44b6de56cefa2be4799cf08e89
tree80a19f6ab582122f8d8f85256a2869f3a83e9edftree | snapshot
parent2d785d841aa8460348ad2c30028dbd59de54ee4ecommit | diff
parent73da93a1f6695f81be041fa984a9e5501d1a16e2commit | 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.