Merge tag 'stm-intel_th-for-greg-20180329' of git://git.kernel.org/pub/scm/linux...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Mar 2018 12:15:13 +0000 (14:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Mar 2018 12:15:13 +0000 (14:15 +0200)
commit86f690e8bfd124c38940e7ad58875ef383003348
treeb8261a4063b0601c4cdc638a75d0048c1e8da82d
parent45ea83f02dc090c477261ac6c93aa2097edca601
parent72ef0f24d587d38f235334aef69afe611bba0d16
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
MAINTAINERS