Merge remote-tracking branch 'jc_docs/docs-next'

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

Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)

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

Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 25 Sep 2015 01:30:21 +0000 (11:30 +1000)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history