tree 80a19f6ab582122f8d8f85256a2869f3a83e9edf
parent 41143b774af2b37c24026521e6eae4c914bd731d
parent cf90ea934028375805e2d39c796eb276001574d7
author Linus Torvalds <torvalds@linux-foundation.org> 1462385640 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1462385640 -0700

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