summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-05-09 10:16:50 +1000
committerDave Airlie <airlied@redhat.com>2016-05-09 10:16:50 +1000
commit2958cf0ee2232cddf06cc9efaf143a0919b266f5 (patch)
tree7526fcfc3c3b923ee646417531be13e615d74077 /MAINTAINERS
parentfd50c3a0326152d97ef02f0d55ee48d7ae66d73f (diff)
parent8863dc7f5642737e49ff681cbb842d2c614bdcf4 (diff)
downloadlinux-stable-2958cf0ee2232cddf06cc9efaf143a0919b266f5.tar.gz
linux-stable-2958cf0ee2232cddf06cc9efaf143a0919b266f5.tar.bz2
linux-stable-2958cf0ee2232cddf06cc9efaf143a0919b266f5.zip
Merge tag 'topic/drm-misc-2016-05-08' of git://anongit.freedesktop.org/drm-intel into drm-next
Refcounting is hard, so here's a quick pull request with the one-liner to fix up i915. Otherwise just a few other small things I picked up. Plus the regression fix from Marten for rmfb behaviour that lingered around forever since no testers. Feel free to cherry-pick that over to drm-fixes, but given that there's not many who seemed to have cared, meh. * tag 'topic/drm-misc-2016-05-08' of git://anongit.freedesktop.org/drm-intel: drm/i915: Correctly refcount connectors in hw state readou drm/panel: Flesh out kerneldoc drm: Add gpu.tmpl docbook to MAINTAINERS entry drm/core: Do not preserve framebuffer on rmfb, v4. drm: Fix up markup fumble drm/fb_helper: Fix a few typos
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e6ee4ecf34b0..33181d862e5a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3765,6 +3765,7 @@ T: git git://people.freedesktop.org/~airlied/linux
S: Maintained
F: drivers/gpu/drm/
F: drivers/gpu/vga/
+F: Documentation/DocBook/gpu.*
F: include/drm/
F: include/uapi/drm/