diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /arch/m68k/sun3x | |
| parent | c201c91799d687c0a6d8c3272950f51aad5ffebe (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
| download | linux-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.bz2 | |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/m68k/sun3x')
| -rw-r--r-- | arch/m68k/sun3x/config.c | 1 | ||||
| -rw-r--r-- | arch/m68k/sun3x/dvma.c | 1 | ||||
| -rw-r--r-- | arch/m68k/sun3x/prom.c | 1 | ||||
| -rw-r--r-- | arch/m68k/sun3x/time.c | 1 | ||||
| -rw-r--r-- | arch/m68k/sun3x/time.h | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index 0532d64d191e..33d3a1c6fba0 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Setup kernel for a Sun3x machine * diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c index 9413c8724b0d..b2acbc862f60 100644 --- a/arch/m68k/sun3x/dvma.c +++ b/arch/m68k/sun3x/dvma.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Virtual DMA allocation * diff --git a/arch/m68k/sun3x/prom.c b/arch/m68k/sun3x/prom.c index 5d60e65c1ee5..be14c899ab7d 100644 --- a/arch/m68k/sun3x/prom.c +++ b/arch/m68k/sun3x/prom.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* Prom access routines for the sun3x */ #include <linux/types.h> diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c index 431d3c4306dd..7a2c53d9f779 100644 --- a/arch/m68k/sun3x/time.c +++ b/arch/m68k/sun3x/time.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * linux/arch/m68k/sun3x/time.c * diff --git a/arch/m68k/sun3x/time.h b/arch/m68k/sun3x/time.h index a4f9126be7e2..496f406412ad 100644 --- a/arch/m68k/sun3x/time.h +++ b/arch/m68k/sun3x/time.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef SUN3X_TIME_H #define SUN3X_TIME_H |