Merge branch 'mediatek-drm-fixes-4.12-rc1' of https://github.com/ckhu-mediatek/linux...
authorDave Airlie <airlied@redhat.com>
Fri, 9 Jun 2017 02:17:00 +0000 (12:17 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 9 Jun 2017 02:17:00 +0000 (12:17 +1000)
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


Trivial merge