diff options
| author | Ingo Molnar <[email protected]> | 2012-09-13 15:18:38 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-09-13 15:18:38 +0000 |
| commit | 4553f0b90e1fd93b95a97918804528d4039201fc (patch) | |
| tree | e17524a262d3e0708479ad35edb706c3e1af5415 /tools/perf/util/scripting-engines/trace-event-perl.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | trace: Don't declare trace_*_rcuidle functions in modules (diff) | |
| download | kernel-4553f0b90e1fd93b95a97918804528d4039201fc.tar.gz kernel-4553f0b90e1fd93b95a97918804528d4039201fc.zip | |
Merge branch 'core/rcu' into perf/core
Steve Rostedt asked for the merge of a single commit, into both
the RCU and the perf/tracing tree:
| Josh made a change to the tracing code that affects both the
| work Paul McKenney and I are currently doing. At the last
| Kernel Summit back in August, Linus said when such a case
| exists, it is best to make a separate branch based off of his
| tree and place the change there. This way, the repositories
| that need to share the change can both pull them in and the
| SHA1 will match for both. Whichever branch is pulled in first
| by Linus will also pull in the necessary change for the other
| branch as well.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-perl.c')
0 files changed, 0 insertions, 0 deletions