Merge airlied/drm-next into drm-misc-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 27 Feb 2017 08:30:11 +0000 (09:30 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 27 Feb 2017 08:30:11 +0000 (09:30 +0100)
commitc771633daf951439ef1875b0da52b56e5696d19f
treebc27744497735062f372ac7b67a0d81b96d24c75
parent62b695662a2413286a25df418b0af665bf2899c5
parent64a577196d66b44e37384bc5c4d78c61f59d5b2a
Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/i915/gvt/cmd_parser.c
drivers/gpu/drm/i915/i915_drv.c