Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10bb6672 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued 



Backmerge drm-next for the reworked device register/unregistering.
Chris Wilson needs that to be able to land his i915 load/unload
demidlayering.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 64989ca4 2a346706

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ 
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml gpu.xml media_api.xml w1.xml \

	    tracepoint.xml media_api.xml w1.xml \

	    writing_musb_glue_layer.xml crypto-API.xml iio.xml



include Documentation/DocBook/media/Makefile