diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 10:51:10 +0100 |
commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /arch/m32r | |
parent | c201c91799d687c0a6d8c3272950f51aad5ffebe (diff) | |
parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) |
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/m32r')
140 files changed, 140 insertions, 0 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 0777f3a8a1f3..0d9446c37ae8 100644 --- a/arch/m32r/Kconfig +++ b/arch/m32r/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 config M32R bool default y diff --git a/arch/m32r/Kconfig.debug b/arch/m32r/Kconfig.debug index 6c612b7691b0..ffca1e194f91 100644 --- a/arch/m32r/Kconfig.debug +++ b/arch/m32r/Kconfig.debug |