Chris Wilson 105f1a65b0 drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next ... The conflict resolution of v4.8-rc8 backmerge to drm-next pulled back in a few lines of dead code due to the code movement around i915_gem_reset(), fix that up. Fixes: ca09fb9f60 ("Merge tag 'v4.8-rc8' into drm-next") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Dave Airlie <airlied@gmail.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20161010125017.23911-1-chris@chris-wilson.co.uk		2016-10-10 16:12:21 +03:00
..
drm	drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next	2016-10-10 16:12:21 +03:00
host1x	drm/tegra: dsi: Enhance runtime power management	2016-08-24 15:58:57 +02:00
ipu-v3	gpu: ipu-v3: Add queued image conversion support	2016-09-19 08:30:27 +02:00
vga	vgaarbiter: rst-ifiy and polish kerneldoc	2016-08-16 18:49:56 +02:00
Makefile