summaryrefslogtreecommitdiff
path: root/include/uapi/misc/fastrpc.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-29 08:30:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-29 08:30:04 +0200
commit2a0f4f16d20127ae0c3f0a3f0190dbbb4d286ba7 (patch)
tree60ad34da8aa2a054d8b562cbac9d06d37c52d5cc /include/uapi/misc/fastrpc.h
parent6389a62ff798e781567645c0b0ca3dd7b8a4289d (diff)
parent609488bc979f99f805f34e9a32c1e3b71179d10b (diff)
downloadlwn-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/uapi/misc/fastrpc.h')
-rw-r--r--include/uapi/misc/fastrpc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h
index 6d701af9fc42..fb792e882cef 100644
--- a/include/uapi/misc/fastrpc.h
+++ b/include/uapi/misc/fastrpc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef __QCOM_FASTRPC_H__
#define __QCOM_FASTRPC_H__