]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'perfcounters/urgent' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Wed, 2 Sep 2009 19:42:56 +0000 (21:42 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 2 Sep 2009 19:42:59 +0000 (21:42 +0200)
commitf76bd108e5031202bb40849306f98c4afebe4ef6
tree455e14a23642a82513eebd4e4f7d3b76842869cd
parentcd6feeeafddbef6abfe4d90fb26e42fd844d34ed
parenteced1dfcfcf6b0a35e925d73916a9d8e36ab5457
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>
kernel/perf_counter.c