diff options
author | 2017-11-07 10:51:10 +0100 | |
---|---|---|
committer | 2017-11-07 10:51:10 +0100 | |
commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /arch/cris/include/arch-v32/arch/bug.h | |
parent | x86/vector/msi: Select CONFIG_GENERIC_IRQ_RESERVATION_MODE (diff) | |
parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq (diff) | |
download | linux-dev-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.xz linux-dev-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.zip |
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/cris/include/arch-v32/arch/bug.h')
-rw-r--r-- | arch/cris/include/arch-v32/arch/bug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/arch-v32/arch/bug.h b/arch/cris/include/arch-v32/arch/bug.h index fb59faaaae0a..982c6b08fdf1 100644 --- a/arch/cris/include/arch-v32/arch/bug.h +++ b/arch/cris/include/arch-v32/arch/bug.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ #ifndef __ASM_CRISv32_ARCH_BUG_H #define __ASM_CRISv32_ARCH_BUG_H |