xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'linus' into x86/apic, to resolve conflicts

Browse Source 
Conflicts:
	arch/x86/include/asm/x2apic.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2017-11-07 10:51:10 +01:00
parent c201c91799 e4880bc5df
commit 141d3b1daa
13358 changed files with 21207 additions and 4982 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/x86_init.h
View File

@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_X86_PLATFORM_H
#define _ASM_X86_PLATFORM_H