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

[sfrench/cifs-2.6.git] / arch / m32r / kernel / irq.c

diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c
index 5537f73972976cdfb634144fbb9424e9bcbd5984..83b5032f176cda472d93d0fbb73d60c04fbd0ab1 100644 (file)
--- a/arch/m32r/kernel/irq.c
+++ b/arch/m32r/kernel/irq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * linux/arch/m32r/kernel/irq.c
  *