Merge "coresight: support for etr to usb output"
Conflicts:
	drivers/coresight/Kconfig
	drivers/coresight/Makefile
	drivers/coresight/coresight-csr.c
	drivers/coresight/coresight-priv.h
	drivers/coresight/coresight-tmc.c
	drivers/coresight/coresight.c
	include/linux/coresight.h
Merge "coresight: don't directly log printk to STM"
Conflicts:
	include/linux/coresight-stm.h
Merge "coresight: change to using smp call for etm enable/disable"
Conflicts:
	drivers/coresight/coresight-etm.c