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)
Pick up 4.14-rc1

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

Simple merge