diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-15 11:33:56 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-15 11:34:00 +0200 |
commit | 713490e02eed242b4c1c672b3c0c8b708f8b6f1d (patch) | |
tree | 8485759cfc112366d2485f473ad348a1c714f421 /fs/xattr_acl.c | |
parent | perf tools: Remove all char * typecasts and use const in prototype (diff) | |
parent | ftrace: Rename set_bootup_ftrace into set_cmdline_ftrace (diff) | |
download | linux-713490e02eed242b4c1c672b3c0c8b708f8b6f1d.tar.xz linux-713490e02eed242b4c1c672b3c0c8b708f8b6f1d.zip |
Merge branch 'tracing/core' into perf/core
Merge reason: to add event filter support we need the following
commits from the tracing tree:
3f6fe06: tracing/filters: Unify the regex parsing helpers
1889d20: tracing/filters: Provide basic regex support
737f453: tracing/filters: Cleanup useless headers
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/xattr_acl.c')
0 files changed, 0 insertions, 0 deletions