Merge branch 'doc/4.9' into docs-next
authorJonathan Corbet <corbet@lwn.net>
Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)
committerJonathan Corbet <corbet@lwn.net>
Mon, 22 Aug 2016 21:40:38 +0000 (15:40 -0600)
1  2 
Documentation/conf.py
Documentation/kernel-documentation.rst

Simple merge