Merge "coresight: resolve pcsave and etm tracing concurreny issue"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: graceful pcsave enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: change ETM locking scheme from mutex to spinlock"
Merge "coresight: graceful etm enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: add STM support for explicit userspace entity ids"
Conflicts:
	include/linux/coresight-stm.h
Merge "coresight: attempt to send data over STM only if size is non-zero"
Merge "coresight: keep drvdata->size as the actual buffer size"
Conflicts:
	drivers/coresight/coresight-tmc.c
Merge "coresight: Have trace_marker only log the actual data"
Merge "tracing: have trace_printk process arguments before storing"
Merge "coresight: resolve pcsave and etm tracing concurreny issue"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: graceful pcsave enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: change ETM locking scheme from mutex to spinlock"
Merge "coresight: graceful etm enable/disable for offline cores"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: add STM support for explicit userspace entity ids"
Conflicts:
	drivers/coresight/coresight-stm.c
Merge "coresight: attempt to send data over STM only if size is non-zero"
Merge "coresight: have trace_printk only log the actual data to STM"
defconfig: Updates for WLAN on the jb_2.5 branch

Bring the msm8960-perf_defconfig and msm8960_defconfig in alignment by
making sure they have the same WLAN configuration.

CRs-Fixed: 440816
Change-Id: I673a23a7d4d1646bb6bec8a1bf794ed6819717d0
Signed-off-by: Jeff Johnson <jjohnson@codeaurora.org>
qseecom:Fix race condition while voting for clocks

In the current functionality, if DFAB clock is already on and a
request is made to turn on SFPB clock, the DFAB clock is turned
off and SFPB clock is turned on and vice-versa.

The above situation can lead to unexpected errors. The current fix
makes sure that clocks that are on are not voted to be off without
explicit request.

Change-Id: I6c3230e23b105c049cdb0aace579b8a176328c84
Signed-off-by: Ramesh Masavarapu <rameshm@codeaurora.org>
(cherry picked from commit 8d7565828aca6023ca968d2e5350737bd6d86215)
qseecom:  Add SFAB clock voting.

Add SFAB voting in  QSEECOM_IOCTL_PERF_ENABLE_REQ.
The SFAB clock needs to be bumped up to its optimal
value when opearting in high bandwidth mode (for max
crypto performance)

Signed-off-by: Mona Hossain <mhossain@codeaurora.org>
(cherry picked from commit 8e2d73a0ade94ffd27882043d562c7ee825d9f7c)

Conflicts:

	drivers/misc/qseecom.c

Change-Id: I281e544756304f19969afbab7196a227dad0e2b1
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
msm: acpuclock-8930{aa}: Lower VDD_DIG voltage vote for L2 at 384MHz

New characterization data shows that vdd_dig voltage for L2@384MHz
can be lowered to the low level. Update the data in this patch.

Change-Id: I7258c54a7245082cfd0d186d32fe7ab792cc8874
Signed-off-by: Tianyi Gou <tgou@codeaurora.org>
(cherry picked from commit 60f828d94cf249a5216512eedfc679ebf2fe18cf)