Merge remote-tracking branch 'rcu/rcu/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 21 Mar 2013 03:30:37 +0000 (14:30 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 21 Mar 2013 03:30:37 +0000 (14:30 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:30:37 +0000 (14:30 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 03:30:37 +0000 (14:30 +1100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc init/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 03:30:37 +0000 (14:30 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 03:30:37 +0000 (14:30 +1100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history