]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'tip/core/rcu' into next.2012.09.25b
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 25 Sep 2012 17:03:56 +0000 (10:03 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 25 Sep 2012 17:03:56 +0000 (10:03 -0700)
commit04d0b6f412896c798758b849ae34a95fce3cf043
treee4db58440018a52089e8d6b39160f753ab10df99
parentc7bc3adea026d34f05c35ea3a5536afe440de85b
parentc795639edc9a5c9511ac0778a26fb87bed6c2d13
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.
kernel/sched/core.c
kernel/time/tick-sched.c