| commit | 593d1006cdf710ab3469c0c37c184fea0bc3da97 | [log] [tgz] |
|---|---|---|
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | Tue Sep 25 10:03:56 2012 -0700 |
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | Tue Sep 25 10:03:56 2012 -0700 |
| tree | e4db58440018a52089e8d6b39160f753ab10df99 | |
| parent | 5217192b85480353aeeb395574e60d0db04f3676 [diff] | |
| parent | 9b20aa63b8fc9a6a3b6831f4eae3621755e51211 [diff] |
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.