From: Greg Kroah-Hartman Date: Thu, 29 Mar 2018 12:15:13 +0000 (+0200) Subject: Merge tag 'stm-intel_th-for-greg-20180329' of git://git.kernel.org/pub/scm/linux... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=86f690e8bfd124c38940e7ad58875ef383003348;p=linux.git Merge tag 'stm-intel_th-for-greg-20180329' of git://git./linux/kernel/git/ash/stm into char-misc-next Alexander writes: stm class/intel_th: Updates for 4.17 These are: * Mass conversion to GPL-2 SPDX header * Moved "hwtracing" to now its own submenu, to uncrowd the parent menu a bit * Added MAINTAINERS entry for drivers/hwtracing * Somewhat small Trace Hub fixes * Added ACPI glue layer for the Trace Hub * Added more module parameters to dummy_stm for better test coverage --- 86f690e8bfd124c38940e7ad58875ef383003348