diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:30:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-29 08:30:04 +0200 |
| commit | 2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7 (patch) | |
| tree | 60ad34da8aa2a054d8b562cbac9d06d37c52d5cc /include/sound/sof/stream.h | |
| parent | 6389a62ff798e781567645c0b0ca3dd7b8a4289d (diff) | |
| parent | 609488bc979f99f805f34e9a32c1e3b71179d10b (diff) | |
| download | lwn-2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7.tar.gz lwn-2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7.zip | |
Merge 5.3-rc2 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/sound/sof/stream.h')
| -rw-r--r-- | include/sound/sof/stream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/sof/stream.h b/include/sound/sof/stream.h index 643f175cb479..0b71b381b952 100644 --- a/include/sound/sof/stream.h +++ b/include/sound/sof/stream.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ /* * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license. |