summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-29 14:15:13 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-29 14:15:13 +0200
commit86f690e8bfd124c38940e7ad58875ef383003348 (patch)
treeb8261a4063b0601c4cdc638a75d0048c1e8da82d /kernel
parent45ea83f02dc090c477261ac6c93aa2097edca601 (diff)
parent72ef0f24d587d38f235334aef69afe611bba0d16 (diff)
downloadlinux-86f690e8bfd124c38940e7ad58875ef383003348.tar.bz2
Merge tag 'stm-intel_th-for-greg-20180329' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions