git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into locking/core, to resolve conflicts
[sfrench/cifs-2.6.git]
/
arch
/
blackfin
/
include
/
uapi
/
asm
/
bfin_sport.h
diff --git
a/arch/blackfin/include/uapi/asm/bfin_sport.h
b/arch/blackfin/include/uapi/asm/bfin_sport.h
index c086de87ee6118270a96de071608465f3666ca1c..86c36a208dc5dcc21fc674370db56e7aef81d8e1 100644
(file)
--- a/
arch/blackfin/include/uapi/asm/bfin_sport.h
+++ b/
arch/blackfin/include/uapi/asm/bfin_sport.h
@@
-1,3
+1,4
@@
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
/*
* bfin_sport.h - interface to Blackfin SPORTs
*