]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'idle.2012.10.23c' into dev.3.8.2012.10.23d
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 23 Oct 2012 22:13:49 +0000 (15:13 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 23 Oct 2012 22:13:49 +0000 (15:13 -0700)
commitec97d8cc8d0063d5ab3ab2db225b844b62f440cd
tree47b4ad9ac92515440c0b4a02f48a64b84bd9a2c5
parent38be7d35ad5d465b8f5fb8aa63274f50fb3f2d14
parent340f588bbaed6cb518aa65e7a330dcc3fff911f8
Merge branch 'idle.2012.10.23c' into dev.3.8.2012.10.23d

Resolved adjacent-change conflicts for:
kernel/rcu.h
kernel/rcutree.c
include/linux/rcupdate.h
include/linux/sched.h
kernel/rcu.h
kernel/rcupdate.c
kernel/rcutiny_plugin.h
kernel/rcutree.c
kernel/rcutree_plugin.h
kernel/sched/core.c
kernel/srcu.c