From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jul 2018 18:41:30 +0000 (-0700)
Subject: Merge tag 'drm-fixes-2018-07-10' of git://anongit.freedesktop.org/drm/drm
X-Git-Tag: v4.18-rc5~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30c2c32d7f703530a6a0c9d2435117a9907d7109;p=thirdparty%2Flinux.git

Merge tag 'drm-fixes-2018-07-10' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
 "This just contains some etnaviv fixes and a MAINTAINERS update for the
  new drm tree locations"

* tag 'drm-fixes-2018-07-10' of git://anongit.freedesktop.org/drm/drm:
  MAINTAINERS: update drm tree
  drm/etnaviv: bring back progress check in job timeout handler
  drm/etnaviv: Fix driver unregistering
  drm/etnaviv: Check for platform_device_register_simple() failure
---

30c2c32d7f703530a6a0c9d2435117a9907d7109