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
/
mm
/
mmu-meta2.c
diff --git
a/arch/metag/mm/mmu-meta2.c
b/arch/metag/mm/mmu-meta2.c
index 81dcbb0bba342c4c63f4ef3c16c87b2b982b9c85..8b668a69c98068ab8d5d5c15d6547c03478da5ff 100644
(file)
--- a/
arch/metag/mm/mmu-meta2.c
+++ b/
arch/metag/mm/mmu-meta2.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2008,2009,2010,2011 Imagination Technologies Ltd.
*