From: Jonathan Corbet <corbet@lwn.net>
Date: Fri, 18 Nov 2016 23:19:28 +0000 (-0700)
Subject: Merge remote-tracking branch 'sound/topic/restize-docs' into sound
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=726d661fea3e3f76d36515c74e4ce58e7789418e;p=linux-beck.git

Merge remote-tracking branch 'sound/topic/restize-docs' into sound

Bring in the sphinxification of the sound documentation.
---

726d661fea3e3f76d36515c74e4ce58e7789418e
diff --cc Documentation/DocBook/Makefile
index 857b772e9da1,72f78ae46c10..c8bd257660eb
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -9,11 -9,10 +9,10 @@@
  DOCBOOKS := z8530book.xml  \
  	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
  	    writing_usb_driver.xml networking.xml \
 -	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
 +	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
  	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
  	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
- 	    debugobjects.xml sh.xml regulator.xml \
- 	    alsa-driver-api.xml writing-an-alsa-driver.xml \
+ 	    80211.xml debugobjects.xml sh.xml regulator.xml \
  	    tracepoint.xml w1.xml \
  	    writing_musb_glue_layer.xml crypto-API.xml iio.xml
  
diff --cc Documentation/index.rst
index 733bd9013541,115c551da5f5..286d92bad208
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@@ -57,16 -18,8 +57,17 @@@ needed)
     media/index
     gpu/index
     80211/index
 +   security/index
+    sound/index
  
 +Korean translations
 +-------------------
 +
 +.. toctree::
 +   :maxdepth: 1
 +
 +   translations/ko_KR/index
 +
  Indices and tables
  ==================