Merge "coresight: add qview entity id for supporting qview traffic"
Merge "coresight: clear pwrup just after clearing pwrdwn"
Merge "coresight: turn on pcsave during first hotplug if enabled in boot"
Merge "coresight: 9625: Modify ETM driver to support ETMv3.5"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "jtagmm: Add save-restore support for Debug and ETM registers"
Merge "coresight: support dumping tmc-etf and tmc-etr on kernel panic"
Merge "coresight: read tmc-etr reservation size from DT node"
Merge "coresight: return error if null or error is passed to coresight_register"
Merge "coresight: read block size for tmc-etr to usb transfers from DT"
Merge "coresight: remove cpu hotplug locking for smp_calls"
Merge "coresight: hotplug enable/disable etm only for round robin access"
Merge "coresight: turn on etm during first cpu hotplug if enabled in boot"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "Revert "coresight: enable and disable STM during probe""
Merge "coresight: reset bam before making etr to usb connection"
Merge "coresight: implement new tmc etr to usb flush procedure"
Merge "msm: kgsl: Add context reference counting to KGSL events"
Merge "msm: kgsl: Add minimum amount of wait in adreno_waittimestamp"
Conflicts:
	drivers/gpu/msm/adreno.c
msm_fb: display: add mdp clock control to histogram enable/disable

Add mdp clock control to histogram enable and disable block to
prevent system from crashing when accessing register with mdp
clocks off.

Change-Id: Ide808b332b5456f3fc639fcbb0d03d5cad0e387f
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
Revert "msm: board-8064: Increase MFC ION heap size by 256KB"

changing MFC heap size requires a corresponding change in TZ and
should affect only 8064 target. Reverting the size change for
8960 target

Change-Id: Iea100464218891e288714ee93cc8786b7c160f94
Signed-off-by: Praveen Chavan <pchava@codeaurora.org>
ASoC: msm: qdsp6: check for invalid port index

Function which converts port ID to port index can return
error value if port ID is invalid. Caller should not
blindly use return value without checking

Change-Id: I02b8112b6714e3364758907e7078bcbb88d45b6b
Signed-off-by: Patrick Lai <plai@codeaurora.org>