diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-03 14:30:12 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-03 14:30:12 +0300 |
commit | 294cbd05e32990c3b1a62be27441fc719edebbab (patch) | |
tree | 9e543bcfdaa183343f18714a256d3fd5c88d3b5c /include/uapi/linux/can.h | |
parent | be96b316deff35e119760982c43af74e606fa143 (diff) | |
parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) | |
download | linux-294cbd05e32990c3b1a62be27441fc719edebbab.tar.xz |
Merge branch 'linus' into perf/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/can.h')
-rw-r--r-- | include/uapi/linux/can.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h index c48d93a28d1a..d7f97ac197a9 100644 --- a/include/uapi/linux/can.h +++ b/include/uapi/linux/can.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* * linux/can.h * |