Merge branch 'linus' into locking/core, to resolve conflicts

[sfrench/cifs-2.6.git] / arch / m32r / boot / compressed / head.S

diff --git a/arch/m32r/boot/compressed/head.S b/arch/m32r/boot/compressed/head.S
index 95a0563ff076e9665f553416a4b3ef1d1816829a..39b693640375f06830472811acf19fe1a3e93fc8 100644 (file)
--- a/arch/m32r/boot/compressed/head.S
+++ b/arch/m32r/boot/compressed/head.S
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  *  linux/arch/m32r/boot/compressed/head.S
  *