Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Sat, 4 Jun 2011 10:28:05 +0000 (12:28 +0200)]
Conflicts:
tools/perf/util/python.c

Merge reason: resolve the conflict with perf/urgent.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
kernel/events/core.c

Simple merge