diff options
author | 2013-12-06 08:28:35 -0800 | |
---|---|---|
committer | 2013-12-06 08:28:35 -0800 | |
commit | 470abdcfda7d59e1ca1edc407a6bfd24193d3e40 (patch) | |
tree | 9b6a6f7dfbdcd3b291833a301fb36c8e7fa6b875 /tools/perf/scripts/python/call-graph-from-postgresql.py | |
parent | Merge tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux (diff) | |
parent | Merge branch 'free-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus (diff) | |
download | linux-dev-470abdcfda7d59e1ca1edc407a6bfd24193d3e40.tar.xz linux-dev-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 'tools/perf/scripts/python/call-graph-from-postgresql.py')
0 files changed, 0 insertions, 0 deletions