summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/irqdomain.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-07 12:51:10 +0300
committerIngo Molnar <mingo@kernel.org>2017-11-07 12:51:10 +0300
commit141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch)
tree04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /arch/x86/include/asm/irqdomain.h
parentc201c91799d687c0a6d8c3272950f51aad5ffebe (diff)
parente4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff)
downloadlinux-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.xz
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts: arch/x86/include/asm/x2apic.h Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/irqdomain.h')
-rw-r--r--arch/x86/include/asm/irqdomain.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/irqdomain.h b/arch/x86/include/asm/irqdomain.h
index 73e9c42ce63b..f695cc6b8e1f 100644
--- a/arch/x86/include/asm/irqdomain.h
+++ b/arch/x86/include/asm/irqdomain.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_IRQDOMAIN_H
#define _ASM_IRQDOMAIN_H