Merge "msm: mdss: hdmi: add SRM support for HDCP1.4"

author Linux Build Service Account <lnxbuild@localhost>

Thu, 15 Mar 2018 12:43:05 +0000 (05:43 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Thu, 15 Mar 2018 12:43:05 +0000 (05:43 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Thu, 15 Mar 2018 12:43:05 +0000 (05:43 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Thu, 15 Mar 2018 12:43:05 +0000 (05:43 -0700)
diff --cc drivers/video/fbdev/msm/mdss_hdmi_tx.c
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Thu, 15 Mar 2018 12:43:05 +0000 (05:43 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Thu, 15 Mar 2018 12:43:05 +0000 (05:43 -0700)