| commit | 7bd5fafeb414cf00deee32c82834f8bf1426b9ac | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Tue, 26 Apr 2011 17:36:14 +0000 (26 19:36 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Tue, 26 Apr 2011 17:36:17 +0000 (26 19:36 +0200) | ||
| tree | 1103053fa40576e9f9fc2818ea1910180e09b752 | treesnapshot (tar.gz zip) |
| parent | fa7b69475a6c192853949ba496dd9c37b497b548 | commitdiff |
| parent | ec75a71634dabe439db91c1ef51d5099f4493808 | commitdiff |
Merge branch 'perf/urgent' into perf/stat
Merge reason: We want to queue up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Merge reason: We want to queue up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| arch/x86/kernel/cpu/perf_event.c | diff1 | diff2 | blobhistory |
| arch/x86/kernel/cpu/perf_event_p4.c | diff1 | diff2 | blobhistory |