Merge tag 'drm-misc-fixes-2018-06-12' of git://anongit.freedesktop.org/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Wed, 20 Jun 2018 06:58:46 +0000 (16:58 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 20 Jun 2018 06:58:49 +0000 (16:58 +1000)
Only a small qxl fix that was queued for v4.17.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/08dcbd63-ed18-6232-7bbd-547a3d63b90f@linux.intel.com
1  2 
drivers/gpu/drm/qxl/qxl_display.c

Simple merge