Merge tag 'omapdrm-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...
authorDave Airlie <airlied@redhat.com>
Wed, 15 Mar 2017 01:30:14 +0000 (11:30 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 15 Mar 2017 01:30:14 +0000 (11:30 +1000)
commit6ed511757702abaa1b9925fd87e049bae3489f05
tree6669e42b83c4f3169e3ca89699b3389dca2b2022
parente7bb40565c43e23956b4aada28008a4eb0628410
parent337ba7fbf0fbc12242359c4af114878618b90951
Merge tag 'omapdrm-4.11-fixes' of git://git./linux/kernel/git/tomba/linux into drm-fixes

omapdrm fixes for v4.11

- Fix types in omapdrm uapi header to avoid userspace compilation errors
- Fix dmabuf mmap for dma_alloc'ed buffers

* tag 'omapdrm-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  uapi: fix drm/omap_drm.h userspace compilation errors
  drm/omap: fix dmabuf mmap for dma_alloc'ed buffers