Merge tag 'drm-fixes-2019-05-03' of git://anongit.freedesktop.org/drm/drm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 May 2019 16:14:07 +0000 (09:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 May 2019 16:14:07 +0000 (09:14 -0700)
Pull drm fix from Dave Airlie:
 "Just a single qxl revert"

* tag 'drm-fixes-2019-05-03' of git://anongit.freedesktop.org/drm/drm:
  Revert "drm/qxl: drop prime import/export callbacks"


Trivial merge