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

Merge commit 'v2.6.32-rc5' into perf/probes 



Conflicts:
	kernel/trace/trace_event_profile.c

Merge reason: update to -rc5 and resolve conflict.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 595c3649 012abeea
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment