Skip to content
Commit 593d1006 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b 

Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.
parents 5217192b 9b20aa63
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