leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts

Browse Source 
Conflicts:
	arch/x86/kernel/cpu/Makefile

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2017-11-07 10:53:06 +01:00
parent c7da092a1f e4880bc5df
commit b3d9a13681
12797 changed files with 14069 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/uapi/asm/processor-flags.h
View File

@@ -1,3 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
#ifndef _UAPI_ASM_X86_PROCESSOR_FLAGS_H
#define _UAPI_ASM_X86_PROCESSOR_FLAGS_H
/* Various flags defined: can be included from assembler. */