diff options
| author | Ingo Molnar <[email protected]> | 2012-05-30 08:59:04 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-05-30 08:59:04 +0000 |
| commit | 063e04776172f93b16a5eefd5661a340c1126513 (patch) | |
| tree | 19cb1623631c8cc5dcf0d91f4731feec7cbefa04 /tools/perf/ui/browsers/annotate.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
| download | kernel-063e04776172f93b16a5eefd5661a340c1126513.tar.gz kernel-063e04776172f93b16a5eefd5661a340c1126513.zip | |
Merge branch 'linus' into perf/urgent
Merge back Linus's latest branch so that we pick up the uprobes changes.
( I tested this branch locally and while it's one from the middle of the
merge window it's a good one to base further work off. )
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
0 files changed, 0 insertions, 0 deletions