diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-04 08:53:04 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-04 08:53:04 +0100 |
commit | 649e441f49d4bfb717e9467950891dc452f4e063 (patch) | |
tree | 2bdfdca65519db2f350c236cbbd65f24d5746cad /arch/cris/boot/rescue/head_v10.S | |
parent | 42f930da7f00c0ab23df4c7aed36137f35988980 (diff) | |
parent | 5cb0512c02ecd7e6214e912e4c150f4219ac78e0 (diff) |
Merge branch 'linus' into core/urgent, to pick up dependent commits
We want to fix an objtool build warning that got introduced in the latest upstream kernel.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/cris/boot/rescue/head_v10.S')
-rw-r--r-- | arch/cris/boot/rescue/head_v10.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/boot/rescue/head_v10.S b/arch/cris/boot/rescue/head_v10.S index 1c05492f3eb2..11eedb1bf31a 100644 --- a/arch/cris/boot/rescue/head_v10.S +++ b/arch/cris/boot/rescue/head_v10.S @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Rescue code, made to reside at the beginning of the * flash-memory. when it starts, it checks a partition |