diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-19 07:11:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-19 07:11:53 +0200 |
| commit | e70c971d7d8ac5b19fea1c2fde0290bcf7881946 (patch) | |
| tree | d022e67b2141b48cfc0ac5b6245588c7f23c6c67 /drivers/hwtracing | |
| parent | nvmem: imx: add i.MX8QM platform support (diff) | |
| parent | Linux 5.3-rc5 (diff) | |
| download | linux-dev-e70c971d7d8ac5b19fea1c2fde0290bcf7881946.tar.xz linux-dev-e70c971d7d8ac5b19fea1c2fde0290bcf7881946.zip | |
Merge 5.3-rc5 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwtracing')
| -rw-r--r-- | drivers/hwtracing/intel_th/msu.h | 2 | ||||
| -rw-r--r-- | drivers/hwtracing/intel_th/pti.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwtracing/intel_th/msu.h b/drivers/hwtracing/intel_th/msu.h index 3f527dd4d727..e771f509bd02 100644 --- a/drivers/hwtracing/intel_th/msu.h +++ b/drivers/hwtracing/intel_th/msu.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 */ /* * Intel(R) Trace Hub Memory Storage Unit (MSU) data structures * diff --git a/drivers/hwtracing/intel_th/pti.h b/drivers/hwtracing/intel_th/pti.h index e9381babc84c..7dfc0431333b 100644 --- a/drivers/hwtracing/intel_th/pti.h +++ b/drivers/hwtracing/intel_th/pti.h @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0 */ /* * Intel(R) Trace Hub PTI output data structures * |