Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu...
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)
cbnum.2013.06.10a: Apply simplifications stemming from the new callback
numbering.

doc.2013.06.10a: Documentation updates.

fixes.2013.06.10a: Miscellaneous fixes.

srcu.2013.06.10a: Updates to SRCU.

tiny.2013.06.10a: Eliminate TINY_PREEMPT_RCU.

1  2  3  4  5 
init/Kconfig
kernel/rcupdate.c
kernel/rcutree.c
kernel/rcutree_plugin.h

diff --cc init/Kconfig
Simple merge
Simple merge
Simple merge
Simple merge