Merge "media: dvb: Optimize setting of secure-mode"
Conflicts:
	drivers/media/dvb/dvb-core/dvb_demux.c
Merge "media: dvb: Fix invocation of secure-demux when playing from TSIF"
Merge "media: dvb: mpq: Fix writing data to sdmx"
Merge "media: dvb: mpq: Fix mutex release"
Merge "msm_fb: Check for panel power on after Unblank."
Merge "msm_fb: display: get mipi frame rate from panel file"
Merge "qseecom: Add kernel space client support"
Conflicts:
	drivers/misc/qseecom.c
	drivers/misc/qseecom_kernel.h
Merge "qseecom: Vote for CE clk before  loading image"
Merge "qseecom: Add API to set bandwidth for CE HW"
Merge "qseecom: Remove mutex lock in load_fw API"
Merge "qseecom: Fix the kernel_qseecom_client send_cmd fucntionality"
Merge "qseecom:  Add SFAB clock voting in set_bandwidth request"
msm_fb: hdmi: HDMI suspend resume event handling

This change makes sure that we do the proper HDMI ON settings at resume
and also send the events to user-space about current status of HPD after
resume.

CRs-Fixed: 422372
Change-Id: I8ca79fd07840b3227c9472588853b0ca2749760b
Signed-off-by: Ajay Singh Parmar <aparmar@codeaurora.org>

Conflicts:
	drivers/video/msm/hdmi_msm.c