diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
| commit | 2a171788ba7bb61995e98e8163204fc7880f63b2 (patch) | |
| tree | 4150a94dd08323748116e5051e56ddee830d4812 /arch/mn10300/include/asm | |
| parent | bf5345882bd18bc1b4966d170c0491ebe5c9a7d6 (diff) | |
| parent | d4c2e9fca5b7db8d315d93a072e65d0847f8e0c5 (diff) | |
| download | linux-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.xz | |
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/mn10300/include/asm')
| -rw-r--r-- | arch/mn10300/include/asm/kmap_types.h | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/mmu.h | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/page_offset.h | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/shmparam.h | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/spinlock_types.h | 1 | ||||
| -rw-r--r-- | arch/mn10300/include/asm/termios.h | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/kmap_types.h b/arch/mn10300/include/asm/kmap_types.h index 76d093b58d4f..f444d7ffa766 100644 --- a/arch/mn10300/include/asm/kmap_types.h +++ b/arch/mn10300/include/asm/kmap_types.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_KMAP_TYPES_H #define _ASM_KMAP_TYPES_H diff --git a/arch/mn10300/include/asm/mmu.h b/arch/mn10300/include/asm/mmu.h index 2d2d097e7309..b9d6d41adace 100644 --- a/arch/mn10300/include/asm/mmu.h +++ b/arch/mn10300/include/asm/mmu.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* MN10300 Memory management context * * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. diff --git a/arch/mn10300/include/asm/page_offset.h b/arch/mn10300/include/asm/page_offset.h index 8eb5b16ad86b..1e869aa09418 100644 --- a/arch/mn10300/include/asm/page_offset.h +++ b/arch/mn10300/include/asm/page_offset.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* MN10300 Kernel base address * * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. diff --git a/arch/mn10300/include/asm/shmparam.h b/arch/mn10300/include/asm/shmparam.h index ab666ed1a070..3a31faaa4353 100644 --- a/arch/mn10300/include/asm/shmparam.h +++ b/arch/mn10300/include/asm/shmparam.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_SHMPARAM_H #define _ASM_SHMPARAM_H diff --git a/arch/mn10300/include/asm/spinlock_types.h b/arch/mn10300/include/asm/spinlock_types.h index 653dc519b405..32abdc89bbc7 100644 --- a/arch/mn10300/include/asm/spinlock_types.h +++ b/arch/mn10300/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/mn10300/include/asm/termios.h b/arch/mn10300/include/asm/termios.h index c2e29c75dfac..4010edcaa08e 100644 --- a/arch/mn10300/include/asm/termios.h +++ b/arch/mn10300/include/asm/termios.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _ASM_TERMIOS_H #define _ASM_TERMIOS_H |