diff options
author | David S. Miller <davem@davemloft.net> | 2017-11-04 09:26:51 +0900 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-04 09:26:51 +0900 |
commit | 2a171788ba7bb61995e98e8163204fc7880f63b2 (patch) | |
tree | 4150a94dd08323748116e5051e56ddee830d4812 /arch/xtensa/include/asm | |
parent | bf5345882bd18bc1b4966d170c0491ebe5c9a7d6 (diff) | |
parent | d4c2e9fca5b7db8d315d93a072e65d0847f8e0c5 (diff) | |
download | linux-stable-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.gz linux-stable-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.bz2 linux-stable-2a171788ba7bb61995e98e8163204fc7880f63b2.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Files removed in 'net-next' had their license header updated
in 'net'. We take the remove from 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/xtensa/include/asm')
-rw-r--r-- | arch/xtensa/include/asm/flat.h | 1 | ||||
-rw-r--r-- | arch/xtensa/include/asm/nommu_context.h | 1 | ||||
-rw-r--r-- | arch/xtensa/include/asm/spinlock_types.h | 1 | ||||
-rw-r--r-- | arch/xtensa/include/asm/unistd.h | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/xtensa/include/asm/flat.h b/arch/xtensa/include/asm/flat.h index 60e0d6a45795..b8532d7877b3 100644 --- a/arch/xtensa/include/asm/flat.h +++ b/arch/xtensa/include/asm/flat.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_XTENSA_FLAT_H #define __ASM_XTENSA_FLAT_H diff --git a/arch/xtensa/include/asm/nommu_context.h b/arch/xtensa/include/asm/nommu_context.h index 22984fd1d846..2cebdbbdb633 100644 --- a/arch/xtensa/include/asm/nommu_context.h +++ b/arch/xtensa/include/asm/nommu_context.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ static inline void init_mmu(void) { } diff --git a/arch/xtensa/include/asm/spinlock_types.h b/arch/xtensa/include/asm/spinlock_types.h index 7ec5ce10c9e9..bb1fe6c1816e 100644 --- a/arch/xtensa/include/asm/spinlock_types.h +++ b/arch/xtensa/include/asm/spinlock_types.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_SPINLOCK_TYPES_H #define __ASM_SPINLOCK_TYPES_H diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h index cb4c2ce8d447..ed66db3bc9bb 100644 --- a/arch/xtensa/include/asm/unistd.h +++ b/arch/xtensa/include/asm/unistd.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _XTENSA_UNISTD_H #define _XTENSA_UNISTD_H |