]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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

1  2 
include/net/cfg80211.h

Simple merge