From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 May 2016 18:14:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4810d9682971e8eee659f96e4f9d9154e3c6c0b4;p=linux.git

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
---

4810d9682971e8eee659f96e4f9d9154e3c6c0b4