Merge remote-tracking branch 'origin/master' into drm-misc-fixes
authorSean Paul <seanpaul@chromium.org>
Thu, 21 Sep 2017 21:18:46 +0000 (14:18 -0700)
committerSean Paul <seanpaul@chromium.org>
Thu, 21 Sep 2017 21:18:46 +0000 (14:18 -0700)
commit1ebfc603d046f1dda6507d11803f9b4046cee712
tree3be6790f2ce819929b1ccff7993c636e0944705a
parentb0e07da3f5c8d069d186a7983ff64eaebf2ea230
parent4a704d6db0ee4a349d5d523813a718e429b4914d
Merge remote-tracking branch 'origin/master' into drm-misc-fixes

Pick up 4.14-rc1

Signed-off-by: Sean Paul <seanpaul@chromium.org>
drivers/gpu/drm/qxl/qxl_display.c