tree 0ab0300e23a02df0fe3c0579627e4998bb122c00
parent cfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0
parent 57d54889cd00db2752994b389ba714138652e60c
author Ingo Molnar <mingo@elte.hu> 1268151113 +0100
committer Ingo Molnar <mingo@elte.hu> 1268151113 +0100

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: Ingo Molnar <mingo@elte.hu>