[linux-yocto] [PATCH 0/2] Fix merge errors on bxt-rebase branch

[Jukka Laitinen]

The i915 module stopped compiling in 4.4.30 rebase. These patches fix the
merge errors causing this.

Jukka Laitinen (2):
  Revert "UPSTREAM: drm/i915: take a power domain ref only when needed
    during HDMI detect"
  Fix merge errors for i915 to compile

 drivers/gpu/drm/i915/intel_drv.h  |  3 ---
 drivers/gpu/drm/i915/intel_hdmi.c | 12 +++++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

-- 
2.7.4