From: Dave Airlie <airlied@redhat.com>
Date: Fri, 9 Jun 2017 02:17:00 +0000 (+1000)
Subject: Merge branch 'mediatek-drm-fixes-4.12-rc1' of https://github.com/ckhu-mediatek/linux... 
X-Git-Tag: Ubuntu-4.12.0-11.12~976^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=97f607fe0d4e8c49e4ee3251bda853f7b6aa75d0;p=mirror_ubuntu-artful-kernel.git

Merge branch 'mediatek-drm-fixes-4.12-rc1' of https://github.com/ckhu-mediatek/linux.git-tags into drm-fixes

mediatek fixes

* 'mediatek-drm-fixes-4.12-rc1' of https://github.com/ckhu-mediatek/linux.git-tags:
  drm/mediatek: fix mtk_hdmi_setup_vendor_specific_infoframe mistake
  drm/mediatek: fix a timeout loop
---

97f607fe0d4e8c49e4ee3251bda853f7b6aa75d0