projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 41143b7 cf90ea9)
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)
commit4810d9682971e8eee659f96e4f9d9154e3c6c0b4
tree80a19f6ab582122f8d8f85256a2869f3a83e9edftree | snapshot
parent41143b774af2b37c24026521e6eae4c914bd731dcommit | diff
parentcf90ea934028375805e2d39c796eb276001574d7commit | diff
Merge branch 'for-linus' of git://git./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
Unnamed repository; edit this file 'description' to name the repository.