diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 14:26:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-28 14:26:19 -0700 |
| commit | 683c5e853ebe2d1ac72128f1828421de7fc3a23c (patch) | |
| tree | 5efaa76d16915feea9241966a90ab93fa4d71397 /arch/x86/include/asm/perf_event.h | |
| parent | f0f3680e50352c57b6cfc5b0d44d63bb0aa20f80 (diff) | |
| parent | 0421ea91ddc7895a5a68d3bc670ed4b8e6448a42 (diff) | |
| download | op-kernel-dev-683c5e853ebe2d1ac72128f1828421de7fc3a23c.zip op-kernel-dev-683c5e853ebe2d1ac72128f1828421de7fc3a23c.tar.gz | |
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 'arch/x86/include/asm/perf_event.h')
0 files changed, 0 insertions, 0 deletions
