Merge branch 'doc/4.9' into docs-next
authorJonathan Corbet <corbet@lwn.net>
Sun, 14 Aug 2016 19:57:55 +0000 (13:57 -0600)
committerJonathan Corbet <corbet@lwn.net>
Sun, 14 Aug 2016 19:57:55 +0000 (13:57 -0600)
1  2 
Documentation/conf.py

Simple merge