diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:21:08 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:21:08 +0100 |
| commit | b5cd3b51e247473e290be5cd09e77171e466cd89 (patch) | |
| tree | ac8c87e1b38f61a4c879c574dc9373db41f3df01 /arch/m32r/boot/compressed | |
| parent | 376f3bcebdc999cc737d9052109cc33b573b3a8b (diff) | |
| parent | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (diff) | |
| download | linux-b5cd3b51e247473e290be5cd09e77171e466cd89.tar.bz2 | |
Merge branch 'linus' into x86/platform, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r/boot/compressed')
| -rw-r--r-- | arch/m32r/boot/compressed/Makefile | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/boot.h | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/head.S | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/m32r_sio.c | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/misc.c | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/vmlinux.lds.S | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/arch/m32r/boot/compressed/Makefile b/arch/m32r/boot/compressed/Makefile index 0606a727aab2..abd3c75ebd32 100644 --- a/arch/m32r/boot/compressed/Makefile +++ b/arch/m32r/boot/compressed/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # linux/arch/m32r/boot/compressed/Makefile # diff --git a/arch/m32r/boot/compressed/boot.h b/arch/m32r/boot/compressed/boot.h index 9272e38d1104..7fce713e8aac 100644 --- a/arch/m32r/boot/compressed/boot.h +++ b/arch/m32r/boot/compressed/boot.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * 1. load vmlinuz * diff --git a/arch/m32r/boot/compressed/head.S b/arch/m32r/boot/compressed/head.S index 95a0563ff076..39b693640375 100644 --- a/arch/m32r/boot/compressed/head.S +++ b/arch/m32r/boot/compressed/head.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/m32r/boot/compressed/head.S * diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c index cf3023dced49..9d34bd063c31 100644 --- a/arch/m32r/boot/compressed/m32r_sio.c +++ b/arch/m32r/boot/compressed/m32r_sio.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/m32r/boot/compressed/m32r_sio.c * diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c index 3a7692745868..43e367055669 100644 --- a/arch/m32r/boot/compressed/misc.c +++ b/arch/m32r/boot/compressed/misc.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * arch/m32r/boot/compressed/misc.c * diff --git a/arch/m32r/boot/compressed/vmlinux.lds.S b/arch/m32r/boot/compressed/vmlinux.lds.S index dd11963f6939..c393eb559c4c 100644 --- a/arch/m32r/boot/compressed/vmlinux.lds.S +++ b/arch/m32r/boot/compressed/vmlinux.lds.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ OUTPUT_ARCH(m32r) ENTRY(startup) |