| commit | 3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Sat, 4 Jun 2011 10:28:05 +0000 (4 12:28 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Sat, 4 Jun 2011 10:28:05 +0000 (4 12:28 +0200) | ||
| tree | 58fbef582846fef0e777b1a552aca12e21a071b1 | treesnapshot (tar.gz zip) |
| parent | aef29bf20bd79c73992ab23d5067e9f0448b466e | commitdiff |
| parent | aa4a221875873d2a1f9656cb7fd7e545e952b4fa | commitdiff |
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>
Conflicts:
tools/perf/util/python.c
Merge reason: resolve the conflict with perf/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| kernel/events/core.c | diff1 | diff2 | blobhistory |