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
/
metag
/
include
/
asm
/
hugetlb.h
diff --git
a/arch/metag/include/asm/hugetlb.h
b/arch/metag/include/asm/hugetlb.h
index 905ed422dbeb36139cb78537692fca381d2e049e..1607363d26395f4c014e29f20adb7d5bbeab463e 100644
(file)
--- a/
arch/metag/include/asm/hugetlb.h
+++ b/
arch/metag/include/asm/hugetlb.h
@@
-1,3
+1,4
@@
+/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_METAG_HUGETLB_H
#define _ASM_METAG_HUGETLB_H