Merge tag 'drm-misc-next-fixes-2017-04-20' of git://anongit.freedesktop.org/git/drm...
authorDave Airlie <airlied@redhat.com>
Fri, 21 Apr 2017 03:51:59 +0000 (13:51 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 21 Apr 2017 03:51:59 +0000 (13:51 +1000)
commit6b1462700b4a6a1244c018cdd2fa97ded43090a0
treefd6051c0334e456bf5d55c9473eb64cdb82db681
parentcb2e77c1d53366696a7f47dbcedba99603ca1b55
parentf9b67f0014cba18f1aabb6fa9272335a043eb6fd
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
MAINTAINERS