summaryrefslogtreecommitdiffstats
path: root/arch/openrisc/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-08 10:17:15 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-08 10:17:15 +0100
commit8a103df440afea30c91ebd42e61dc644e647f4bd (patch)
tree2cfa99e9c6e1e138e1404bce4294e46cb0034cce /arch/openrisc/kernel
parenta9903f04e0a4ea522d959c2f287cdf0ab029e324 (diff)
parentfbc3edf7d7731d7a22c483c679700589bab936a3 (diff)
downloadtalos-op-linux-8a103df440afea30c91ebd42e61dc644e647f4bd.tar.gz
talos-op-linux-8a103df440afea30c91ebd42e61dc644e647f4bd.zip
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/openrisc/kernel')
-rw-r--r--arch/openrisc/kernel/Makefile1
-rw-r--r--arch/openrisc/kernel/vmlinux.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/openrisc/kernel/Makefile b/arch/openrisc/kernel/Makefile
index ec6d9d37cefd..c4ea6cabad46 100644
--- a/arch/openrisc/kernel/Makefile
+++ b/arch/openrisc/kernel/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#
# Makefile for the linux kernel.
#
diff --git a/arch/openrisc/kernel/vmlinux.h b/arch/openrisc/kernel/vmlinux.h
index bbcdf21b0b35..bdea46c617c7 100644
--- a/arch/openrisc/kernel/vmlinux.h
+++ b/arch/openrisc/kernel/vmlinux.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
#ifndef __OPENRISC_VMLINUX_H_
#define __OPENRISC_VMLINUX_H_
OpenPOWER on IntegriCloud