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

Merge branch 'sched/clock' into tracing/ftrace 

Conflicts:
	kernel/sched_clock.c
parents 14131f2f 83ce4009
Hide whitespace changes
Inline Side-by-side
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