| commit | c7f9a6f377fa64e5a74f8c128d4349765c28fab1 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Mon, 7 Feb 2011 07:44:11 +0000 (7 08:44 +0100) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Mon, 7 Feb 2011 07:44:26 +0000 (7 08:44 +0100) | ||
| tree | e71eaf08c5f9179d6fd6c7e08d8539358dc76ad1 | treesnapshot (tar.gz zip) |
| parent | fe4b04fa31a6dcf4358aa84cf81e5a7fd079469b | commitdiff |
| parent | 8dbdea8444d303a772bceb1ba963f0e3273bfc5e | commitdiff |
Merge branch 'linus' into perf/core
Merge reason: Pick up perf fixes that are now upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Merge reason: Pick up perf fixes that are now upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| kernel/perf_event.c | diff1 | diff2 | blobhistory |
| tools/perf/util/evsel.c | diff1 | diff2 | blobhistory |