From: Dave Airlie <airlied@redhat.com>
Date: Tue, 10 May 2016 05:07:50 +0000 (+1000)
Subject: Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de:/git/lst/linux into drm... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=19ea5da07a1f315191212e094ec44fb1caec9580;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

not much new stuff this time. A (micro-)optimization to allow the
hangcheck timer to be coalesced with other wakeups in the system and a
fix to handle mmaping of prime imported and userptr buffers correctly. I
don't think we have seen any actual issues going back to this yet, so I
figured it's safer to get this in via drm-next rather than smashing it
into fixes.

* 'drm-etnaviv-next' of git://git.pengutronix.de:/git/lst/linux:
  drm/etnaviv: fix mmap operations for userptr and dma-buf objects
  drm/etnaviv: take etnaviv_gem_obj in etnaviv_gem_mmap_obj
  drm/etnaviv: use deferrable timer for hangcheck handler
  timer: add setup_deferrable_timer macro
---

19ea5da07a1f315191212e094ec44fb1caec9580