From: Dave Airlie <airlied@redhat.com>
Date: Tue, 6 Dec 2016 01:00:16 +0000 (+1000)
Subject: Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux into drm-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=770ac20413ce654f6e4efaaf24e954ebb907fc3b;p=linux-beck.git

Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux into drm-next

- fix dma-buf export path to return correct SG table
- trivially implement direct dma-buf mapping
- allow DRAW_INSTANCED commands in validator
- make the driver work on i.MX6SX, yielding a working 2D/3D stack
together with Mareks MXS DRM driver

* 'drm-etnaviv-next' of git://git.pengutronix.de/lst/linux:
  MAINTAINERS: add etnaviv mailinglist
  drm/etnaviv: move linear window on MC1.0 parts if necessary
  drm/etnaviv: don't invoke OOM killer from dump code
  drm/etnaviv: fix gem_prime_get_sg_table to return new SG table
  drm/etnaviv: Allow DRAW_INSTANCED commands
  drm/etnaviv: implement dma-buf mmap
---

770ac20413ce654f6e4efaaf24e954ebb907fc3b