From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Oct 2016 21:11:22 +0000 (-0700)
Subject: Merge tag 'docs-4.9-2' of git://git.lwn.net/linux
X-Git-Tag: v5.15~12645
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4d24d2d0a7ea3b62efd7336bfc2344e29b36bc5;p=platform%2Fkernel%2Flinux-starfive.git

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
---

d4d24d2d0a7ea3b62efd7336bfc2344e29b36bc5