Merge branch 'doc/4.9' into docs-next

author Jonathan Corbet <corbet@lwn.net>

Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)

committer Jonathan Corbet <corbet@lwn.net>

Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)
author Jonathan Corbet <corbet@lwn.net>
Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)
committer Jonathan Corbet <corbet@lwn.net>
Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)
diff --cc Documentation/conf.py
Simple merge
diff --cc Documentation/kernel-documentation.rst
Simple merge
author	Jonathan Corbet <corbet@lwn.net>
	Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)
committer	Jonathan Corbet <corbet@lwn.net>
	Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)
		1	2
Documentation/conf.py	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/kernel-documentation.rst	patch \|	diff1 \|	diff2 \|	blob \| history