summaryrefslogtreecommitdiff
path: root/include/uapi/linux/rio_cm_cdev.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-07 12:53:06 +0300
committerIngo Molnar <mingo@kernel.org>2017-11-07 12:53:06 +0300
commitb3d9a136815ca9284ade2a897a3b7d2b0084c33c (patch)
treeaf222e53d833ff7218577cf98e1b856d9d6bda93 /include/uapi/linux/rio_cm_cdev.h
parentc7da092a1f243bfd1bfb4124f538e69e941882da (diff)
parente4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff)
downloadlinux-b3d9a136815ca9284ade2a897a3b7d2b0084c33c.tar.xz
Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts
Conflicts: arch/x86/kernel/cpu/Makefile Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/rio_cm_cdev.h')
-rw-r--r--include/uapi/linux/rio_cm_cdev.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/rio_cm_cdev.h b/include/uapi/linux/rio_cm_cdev.h
index 6edb900d318d..d05dc3226f8e 100644
--- a/include/uapi/linux/rio_cm_cdev.h
+++ b/include/uapi/linux/rio_cm_cdev.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
/*
* Copyright (c) 2015, Integrated Device Technology Inc.
* Copyright (c) 2015, Prodrive Technologies