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)
commit176d5325d1a7d088e96cfef898fa7d3a622a6903
treef12c24b72202e032114aef576f53deac9f595646
parent70a84f3c6075031dbf004a1610ca2471f4c528aa
parentf150891fd9878ef0d9197c4e8451ce67c3bdd014
Merge airlied/drm-next into drm-intel-next-queued

Catchup with upstream.

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