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

diff --cc Documentation/DocBook/drm.tmpl
Simple merge

diff --cc Documentation/input/alps.txt
Simple merge

diff --cc Documentation/input/event-codes.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge