Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Fri, 7 May 2010 09:30:29 +0000 (11:30 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 7 May 2010 09:30:30 +0000 (11:30 +0200)
commitcce913178118b0b36742eb7544c2b38a0c957ee7
tree25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f
parentd9f599e1e6d019968b35d2dc63074b9e8964fa69
parent4fd38e4595e2f6c9d27732c042a0e16b2753049c
Merge branch 'perf/urgent' into perf/core

Merge reason: Resolve patch dependency

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/perf_event.h
kernel/perf_event.c
kernel/sched.c