Merge branch 'doc/4.9' into docs-next
authorJonathan Corbet <corbet@lwn.net>
Thu, 18 Aug 2016 23:22:10 +0000 (17:22 -0600)
committerJonathan Corbet <corbet@lwn.net>
Thu, 18 Aug 2016 23:22:10 +0000 (17:22 -0600)
1  2 
Documentation/conf.py

Simple merge