diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-29 14:15:13 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-29 14:15:13 +0200 |
commit | 86f690e8bfd124c38940e7ad58875ef383003348 (patch) | |
tree | b8261a4063b0601c4cdc638a75d0048c1e8da82d /drivers/nvmem/bcm-ocotp.c | |
parent | hv: add SPDX license id to Kconfig (diff) | |
parent | hwtracing: Add HW tracing support menu (diff) | |
download | linux-86f690e8bfd124c38940e7ad58875ef383003348.tar.xz linux-86f690e8bfd124c38940e7ad58875ef383003348.zip |
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 'drivers/nvmem/bcm-ocotp.c')
0 files changed, 0 insertions, 0 deletions