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

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

Thu, 11 Feb 2016 01:46:25 +0000 (12:46 +1100)

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

Thu, 11 Feb 2016 01:46:25 +0000 (12:46 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 01:46:25 +0000 (12:46 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 11 Feb 2016 01:46:25 +0000 (12:46 +1100)
diff --cc Documentation/DocBook/device-drivers.tmpl
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 01:46:25 +0000 (12:46 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 11 Feb 2016 01:46:25 +0000 (12:46 +1100)