Merge branches 'cbnum.2013.06.10a', 'doc.2013.06.10a', 'fixes.2013.06.10a', 'srcu...

author Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)

committer Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)
author Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)
committer Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)
diff --cc init/Kconfig
Simple merge
diff --cc kernel/rcupdate.c
Simple merge
diff --cc kernel/rcutree.c
Simple merge
diff --cc kernel/rcutree_plugin.h
Simple merge
author	Paul E. McKenney <paulmck@linux.vnet.ibm.com>
	Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)
committer	Paul E. McKenney <paulmck@linux.vnet.ibm.com>
	Mon, 10 Jun 2013 20:46:44 +0000 (13:46 -0700)
		1	2	3	4	5
init/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/rcupdate.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/rcutree.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
kernel/rcutree_plugin.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history