Merge tag 'docs-4.9-2' of git://git.lwn.net/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2016 21:11:22 +0000 (14:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2016 21:11:22 +0000 (14:11 -0700)
commitd4d24d2d0a7ea3b62efd7336bfc2344e29b36bc5
tree051eb75f8c5cfad65db8036d976c24a7fdc78325
parentac9ef8cd075a1efee13036908a99a4bd5f9d4b8c
parent819bf593767c0966f320c51c6ed3f3835062abc8
Merge tag 'docs-4.9-2' of git://git.lwn.net/linux

Pull one more documentation update from Jonathan Corbet:
 "A single commit converting the mac80211 DocBook template over to
  Sphinx.  Only 32 more to go..."

* tag 'docs-4.9-2' of git://git.lwn.net/linux:
  docs-rst: sphinxify 802.11 documentation
include/net/cfg80211.h