diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:28:05 +0200 |
| commit | 3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4 (patch) | |
| tree | 58fbef582846fef0e777b1a552aca12e21a071b1 /net | |
| parent | Merge branch 'perf/core' of ssh://k/pub/scm/linux/kernel/git/acme/linux into ... (diff) | |
| parent | perf: Comment /proc/sys/kernel/perf_event_paranoid to be part of user ABI (diff) | |
| download | linux-3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4.tar.xz linux-3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions