Merge airlied/drm-next into drm-intel-next-queued
authorRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 14 Nov 2017 15:43:00 +0000 (07:43 -0800)
committerRodrigo Vivi <rodrigo.vivi@intel.com>
Tue, 14 Nov 2017 15:43:00 +0000 (07:43 -0800)
Catchup with upstream.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1  2 
drivers/gpu/drm/i915/intel_bios.c

Simple merge