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)
commit97f607fe0d4e8c49e4ee3251bda853f7b6aa75d0
treec223d532b6dd5b414867ec91cd1a4853878e7e58
parentdd44c95739dffafac0e52076dd750911180295d4
parent014580ffab654bb83256783a2b185cf6c06dffaa
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