Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Sat, 3 Apr 2010 16:17:55 +0000 (18:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 3 Apr 2010 16:17:55 +0000 (18:17 +0200)
commit22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d
tree9981477f6f9e4527a9598e636d0ffc7705a322a4
parent70a7c1271e2bfca8ad2bf71f44c516ea2763b9ed
parent6e03bb5ad363fdbe4e1e227cfb78f7978c662e18
Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/Makefile

Merge reason: resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c
tools/perf/Makefile