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 /include/linux | |
parent | 45ea83f02dc090c477261ac6c93aa2097edca601 (diff) | |
parent | 72ef0f24d587d38f235334aef69afe611bba0d16 (diff) |
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 'include/linux')
-rw-r--r-- | include/linux/stm.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/linux/stm.h b/include/linux/stm.h index 210ff2292361..c6f577ab6f21 100644 --- a/include/linux/stm.h +++ b/include/linux/stm.h @@ -1,15 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * System Trace Module (STM) infrastructure apis * Copyright (C) 2014 Intel Corporation. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. */ #ifndef _STM_H_ |