| commit | f76bd108e5031202bb40849306f98c4afebe4ef6 | |
| author | Ingo Molnar <mingo@elte.hu> | |
| Wed, 2 Sep 2009 19:42:56 +0000 (2 21:42 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Wed, 2 Sep 2009 19:42:59 +0000 (2 21:42 +0200) | ||
| tree | 455e14a23642a82513eebd4e4f7d3b76842869cd | treesnapshot (tar.gz zip) |
| parent | cd6feeeafddbef6abfe4d90fb26e42fd844d34ed | commitdiff |
| parent | eced1dfcfcf6b0a35e925d73916a9d8e36ab5457 | commitdiff |
Merge branch 'perfcounters/urgent' into perfcounters/core
Merge reason: We are going to modify a place modified by
perfcounters/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Merge reason: We are going to modify a place modified by
perfcounters/urgent.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| kernel/perf_counter.c | diff1 | diff2 | blobhistory |