[linux-yocto] [PATCH 0/1] Fix i915 merge

[California Sullivan]

Eric, Bruce, please make sure my strategy with this fix is sane before
merging.

If it is, please apply it to standard/intel/base and merge into all the
other intel branches.

Thanks,
Cal Sullivan

California Sullivan (1):
  drm/i915: Fix i915 merge with v4.4.16

 drivers/gpu/drm/i915/i915_reg.h               |  2 ++
 drivers/gpu/drm/i915/intel_dp.c               | 11 +++++------
 drivers/gpu/drm/i915/intel_dp_link_training.c | 26 ++------------------------
 drivers/gpu/drm/i915/intel_drv.h              |  2 --
 4 files changed, 9 insertions(+), 32 deletions(-)

-- 
2.5.5