]> 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)
commitc9a306525e9033754bea2c863262c9e0c1c4cac5
treee4db58440018a52089e8d6b39160f753ab10df99
parent7a01ee674e7377748b7776daabe05020d9622f7d
parent42322c4fa104bb68496429df80f378da4764f849
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