Uwe Kleine-König 1609faa9e6 coresight: etm4x: Fix merge resolution for amba rework ... This was non-trivial to get right because commits c23bc382ef ("coresight: etm4x: Refactor probing routine") and 5214b56358 ("coresight: etm4x: Add support for sysreg only devices") changed the code flow considerably. With this change the driver can be built again. Fixes: 0573d3fa48 ("Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next") Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org> Link: https://lore.kernel.org/r/20210205130848.20009-1-uwe@kleine-koenig.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2021-02-05 15:02:48 +01:00
..
coresight	coresight: etm4x: Fix merge resolution for amba rework	2021-02-05 15:02:48 +01:00
intel_th	intel_th: pci: Add Alder Lake-P support	2021-01-21 18:54:43 +01:00
stm	stm class: Fix module init return on allocation failure	2021-01-21 18:54:37 +01:00
Kconfig	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00