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 /arch/x86/kernel/trampoline_64.S | |
| parent | c4dc775f53136cd6af8f88bce67cce9b42751768 (diff) | |
| parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
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 'arch/x86/kernel/trampoline_64.S')
0 files changed, 0 insertions, 0 deletions