diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-06 17:28:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-06 17:28:35 +0100 |
| commit | 470abdcfda7d59e1ca1edc407a6bfd24193d3e40 (patch) | |
| tree | 9b6a6f7dfbdcd3b291833a301fb36c8e7fa6b875 /fs | |
| parent | Merge tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge branch 'free-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/z... (diff) | |
| download | linux-470abdcfda7d59e1ca1edc407a6bfd24193d3e40.tar.xz linux-470abdcfda7d59e1ca1edc407a6bfd24193d3e40.zip | |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions