Merge "coresight: change STM ATID to allow concurrent trace sources"
Conflicts:
	arch/arm/mach-msm/board-8064.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
	drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tspp_v1.c
	drivers/power/pm8921-charger.c
Merge "coresight: implement crash dumping support"
Conflicts:
	drivers/coresight/coresight-etm.c
	drivers/coresight/coresight-tmc.c
Merge "coresight: simplify etm_init_arch_data"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "jtag: make debug arch defines local to jtag.c"
Conflicts:
	include/linux/coresight.h
Merge "coresight: A DLKM to abort trace on userspace abort"
Merge "coresight: use ETMPDCR instead of ETMCR for ETM power/clock control"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: move cp14.h to include/asm/hardware"
Conflicts:
	arch/arm/mach-msm/jtag.c
Merge "coresight: cp14 support for etm driver for krait v3"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "gpu: ion: Use writecombine for uncached mappings"
usb: diag_bridge: Support PID 9079

Add support for PID 0x9079 and also designate device IDs per-PID.
9079, having a device ID of 1, is intended to be able to coexist
with another probed device with device ID 0.

Change-Id: Ib8cc52a9277b0013e098baeaafa6fce1c8498c42
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Merge "coresight: initialize buf during tmc etr probe"
Merge "coresight: enable and disable STM during probe"
Merge "coresight: explicitly control ETMCR & preserve prog & power down bits"
Merge "coresight: implement runtime pc save control"
Conflicts:
	Documentation/devicetree/bindings/coresight/coresight.txt
	drivers/coresight/coresight-etm.c
Merge "defconfig: build control_trace module for msm8960"
Merge "coresight: Remove license info from coresight-stm.h"
Conflicts:
	include/linux/coresight-stm.h
Merge "coresight: use 2K block size transfers for output via usb"
Merge "coresight: resolve pcsave and etm tracing concurreny issue"
Conflicts:
	drivers/coresight/coresight-etm.c
Merge "coresight: graceful pcsave enable/disable for offline cores"
Merge "coresight: change ETM locking scheme from mutex to spinlock"
Conflicts:
	drivers/coresight/coresight-etm.c