Skip to content
Commit 548b8416 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.34-rc1' into perf/urgent



Conflicts:
	tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents cfb581bc 57d54889
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment