diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 12:30:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 12:30:18 +0300 |
| commit | 15bcdc9477b03eb035052412c3a087e11e855e76 (patch) | |
| tree | e1e3c1f2b89e3a705d1737d61a4d8a9394a1930e /arch/mips/fw/arc | |
| parent | 340b5319c98eb14f7a70947a38e17d06f5beea88 (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
| download | linux-15bcdc9477b03eb035052412c3a087e11e855e76.tar.xz | |
Merge branch 'linus' into perf/core, to fix conflicts
Conflicts:
tools/perf/arch/arm/annotate/instructions.c
tools/perf/arch/arm64/annotate/instructions.c
tools/perf/arch/powerpc/annotate/instructions.c
tools/perf/arch/s390/annotate/instructions.c
tools/perf/arch/x86/tests/intel-cqm.c
tools/perf/ui/tui/progress.c
tools/perf/util/zlib.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/fw/arc')
| -rw-r--r-- | arch/mips/fw/arc/Makefile | 1 | ||||
| -rw-r--r-- | arch/mips/fw/arc/arc_con.c | 1 | ||||
| -rw-r--r-- | arch/mips/fw/arc/memory.c | 1 | ||||
| -rw-r--r-- | arch/mips/fw/arc/salone.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/fw/arc/Makefile b/arch/mips/fw/arc/Makefile index 4f349ec1ea2d..31dd7305d643 100644 --- a/arch/mips/fw/arc/Makefile +++ b/arch/mips/fw/arc/Makefile @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 # # Makefile for the ARC prom monitor library routines under Linux. # diff --git a/arch/mips/fw/arc/arc_con.c b/arch/mips/fw/arc/arc_con.c index bc32fe64f42a..769d4b9ac82e 100644 --- a/arch/mips/fw/arc/arc_con.c +++ b/arch/mips/fw/arc/arc_con.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Wrap-around code for a console using the * ARC io-routines. diff --git a/arch/mips/fw/arc/memory.c b/arch/mips/fw/arc/memory.c index 0d75b5a0bad4..dd9496f26e6a 100644 --- a/arch/mips/fw/arc/memory.c +++ b/arch/mips/fw/arc/memory.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * memory.c: PROM library functions for acquiring/using memory descriptors * given to us from the ARCS firmware. diff --git a/arch/mips/fw/arc/salone.c b/arch/mips/fw/arc/salone.c index 9b568950d1fd..2d99f44d5576 100644 --- a/arch/mips/fw/arc/salone.c +++ b/arch/mips/fw/arc/salone.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Routines to load into memory and execute stand-along program images using * ARCS PROM firmware. |