Merge remote-tracking branch 'drm-intel/for-linux-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 02:51:20 +0000 (13:51 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 10 Dec 2018 02:51:20 +0000 (13:51 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 02:51:20 +0000 (13:51 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Dec 2018 02:51:20 +0000 (13:51 +1100)
diff --cc drivers/gpu/drm/i915/i915_gem_execbuffer.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 02:51:20 +0000 (13:51 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 10 Dec 2018 02:51:20 +0000 (13:51 +1100)