diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-21 06:51:59 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-21 06:51:59 +0300 |
| commit | 6b1462700b4a6a1244c018cdd2fa97ded43090a0 (patch) | |
| tree | fd6051c0334e456bf5d55c9473eb64cdb82db681 /MAINTAINERS | |
| parent | cb2e77c1d53366696a7f47dbcedba99603ca1b55 (diff) | |
| parent | f9b67f0014cba18f1aabb6fa9272335a043eb6fd (diff) | |
| download | linux-6b1462700b4a6a1244c018cdd2fa97ded43090a0.tar.xz | |
Merge tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc into drm-next
drm-misc-next-fixes-2017-04-20
Core changes:
- Maintain sti via drm-misc (Vincent)
- Rename dma_buf_ops->kmap_* to avoid naming collision (Logan)
Driver changes:
- Fix UHD displays on stih407 (Vincent)
- Fix uninitialized var return in atmel-hlcdc (Dan)
* tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm-misc:
dma-buf: Rename dma-ops to prevent conflict with kunmap_atomic macro
drm: atmel-hlcdc: Uninitialized return in atmel_hlcdc_create_outputs()
drm/sti: fix GDP size to support up to UHD resolution
MAINTAINERS: add drm/sti driver into drm-misc
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index afba0760fdaf..66f5b55d205a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4418,7 +4418,7 @@ DRM DRIVERS FOR STI M: Benjamin Gaignard <benjamin.gaignard@linaro.org> M: Vincent Abriou <vincent.abriou@st.com> L: dri-devel@lists.freedesktop.org -T: git http://git.linaro.org/people/benjamin.gaignard/kernel.git +T: git git://anongit.freedesktop.org/drm/drm-misc S: Maintained F: drivers/gpu/drm/sti F: Documentation/devicetree/bindings/display/st,stih4xx.txt |