diff options
author | 2019-06-09 09:11:21 +0200 | |
---|---|---|
committer | 2019-06-09 09:11:21 +0200 | |
commit | 0154ec71d597692a0d0682b19eac4b3adfb7f3dc (patch) | |
tree | 121b4ac35146f5696da090d3ae2534c76523e6c2 /sound/firewire/motu/amdtp-motu-trace.h | |
parent | VMCI: Fixup atomic64_t abuse (diff) | |
parent | Linux 5.2-rc4 (diff) | |
download | linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.tar.xz linux-dev-0154ec71d597692a0d0682b19eac4b3adfb7f3dc.zip |
Merge 5.2-rc4 into char-misc-next
We want the char/misc driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/firewire/motu/amdtp-motu-trace.h')
-rw-r--r-- | sound/firewire/motu/amdtp-motu-trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/motu/amdtp-motu-trace.h b/sound/firewire/motu/amdtp-motu-trace.h index cd0cbfa9f96f..4d2351c0e8a3 100644 --- a/sound/firewire/motu/amdtp-motu-trace.h +++ b/sound/firewire/motu/amdtp-motu-trace.h @@ -1,8 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * amdtp-motu-trace.h - tracepoint definitions to dump a part of packet data * * Copyright (c) 2017 Takashi Sakamoto - * Licensed under the terms of the GNU General Public License, version 2. */ #undef TRACE_SYSTEM |