Skip to content
Commit 3772b734 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.35' into perf/core



Conflicts:
	tools/perf/Makefile
	tools/perf/util/hist.c

Merge reason: Resolve the conflicts and update to latest upstream.

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