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/mm | |
| parent | 376f3bcebdc999cc737d9052109cc33b573b3a8b (diff) | |
| parent | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (diff) | |
Merge branch 'linus' into x86/platform, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m32r/mm')
| -rw-r--r-- | arch/m32r/mm/Makefile | 1 | ||||
| -rw-r--r-- | arch/m32r/mm/cache.c | 1 | ||||
| -rw-r--r-- | arch/m32r/mm/discontig.c | 1 | ||||
| -rw-r--r-- | arch/m32r/mm/extable.c | 1 | ||||
| -rw-r--r-- | arch/m32r/mm/fault-nommu.c | 1 | ||||
| -rw-r--r-- | arch/m32r/mm/fault.c | 1 | ||||
| -rw-r--r-- | arch/m32r/mm/init.c | 1 | ||||
| -rw-r--r-- | arch/m32r/mm/mmu.S | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/arch/m32r/mm/Makefile b/arch/m32r/mm/Makefile index c51c1c3b4a5f..cb20d90c51d1 100644 --- a/arch/m32r/mm/Makefile +++ b/arch/m32r/mm/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the Linux M32R-specific parts of the memory manager. # diff --git a/arch/m32r/mm/cache.c b/arch/m32r/mm/cache.c index fac759584875..0d1ae744e56f 100644 --- a/arch/m32r/mm/cache.c +++ b/arch/m32r/mm/cache.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m32r/mm/cache.c * diff --git a/arch/m32r/mm/discontig.c b/arch/m32r/mm/discontig.c index 27196303ce36..eb8e7966dcaf 100644 --- a/arch/m32r/mm/discontig.c +++ b/arch/m32r/mm/discontig.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m32r/mm/discontig.c * diff --git a/arch/m32r/mm/extable.c b/arch/m32r/mm/extable.c index 8ac8ba6ef60c..066982756a4e 100644 --- a/arch/m32r/mm/extable.c +++ b/arch/m32r/mm/extable.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m32r/mm/extable.c */ diff --git a/arch/m32r/mm/fault-nommu.c b/arch/m32r/mm/fault-nommu.c index e22d5ddae5cb..240e00067d5e 100644 --- a/arch/m32r/mm/fault-nommu.c +++ b/arch/m32r/mm/fault-nommu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m32r/mm/fault.c * diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c index a05dc3184594..46d9a5ca0e3a 100644 --- a/arch/m32r/mm/fault.c +++ b/arch/m32r/mm/fault.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m32r/mm/fault.c * diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index 11fa717d93b1..93abc8c3a46e 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m32r/mm/init.c * diff --git a/arch/m32r/mm/mmu.S b/arch/m32r/mm/mmu.S index e9491a5ae827..fd8f9c9b7b07 100644 --- a/arch/m32r/mm/mmu.S +++ b/arch/m32r/mm/mmu.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * linux/arch/m32r/mm/mmu.S * |