From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Dec 2013 16:28:35 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v5.4.17~16026
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=470abdcfda7d59e1ca1edc407a6bfd24193d3e40;p=arm%2Flinux.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull IMA fixes from James Morris:
 "Here are two more fixes for IMA"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  ima: properly free ima_template_entry structures
  ima: Do not free 'entry' before it is initialized
---

470abdcfda7d59e1ca1edc407a6bfd24193d3e40