diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-03 10:39:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-03 10:39:40 -0700 |
| commit | 3bfd245476eca2f8375249f3a1e7a60d3c754f47 (patch) | |
| tree | 09f0b3e3bfec1d19c7313d49749422b6c8ffdf7c /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | security: Fix nommu build. (diff) | |
| download | wireguard-linux-3bfd245476eca2f8375249f3a1e7a60d3c754f47.tar.xz wireguard-linux-3bfd245476eca2f8375249f3a1e7a60d3c754f47.zip | |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer fixes from James Morris.
A documentation update, and a nommu build fix.
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
security: Fix nommu build.
security: document no_new_privs
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions