git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5217192 9b20aa6)
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)
Resolved conflict in kernel/sched/core.c using Peter Zijlstra's
approach from https://lkml.org/lkml/2012/9/5/585.


Trivial merge
Pandora Kernel Repository