diff options
author | 2012-03-28 14:26:19 -0700 | |
---|---|---|
committer | 2012-03-28 14:26:19 -0700 | |
commit | 683c5e853ebe2d1ac72128f1828421de7fc3a23c (patch) | |
tree | 5efaa76d16915feea9241966a90ab93fa4d71397 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac (diff) | |
parent | apparmor: Fix change_onexec when called from a confined task (diff) | |
download | linux-dev-683c5e853ebe2d1ac72128f1828421de7fc3a23c.tar.xz linux-dev-683c5e853ebe2d1ac72128f1828421de7fc3a23c.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull an Apparmor bugfix from James Morris.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
apparmor: Fix change_onexec when called from a confined task
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions