]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 24cb412 bfb2632)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Dec 2013 16:28:35 +0000 (08:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Dec 2013 16:28:35 +0000 (08:28 -0800)
commit470abdcfda7d59e1ca1edc407a6bfd24193d3e40
tree9b6a6f7dfbdcd3b291833a301fb36c8e7fa6b875tree
parent24cb412041456924a405221635cb5fb64c643903commit | diff
parentbfb26328b9e4141dafc714c512c079c11d7c1552commit | diff
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
Ubuntu Disco kernel mirror for Proxmox VE and PMG