Merge commit '14ffcff86dc36fad827ef8350d847daee56e63e4' into HEAD

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

Mon, 3 Jun 2013 03:44:59 +0000 (20:44 -0700)

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

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