Ingo Molnar 413d63d71b Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts ... Conflicts: arch/x86/kernel/head64.c arch/x86/mm/mmap.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-08-26 09:19:13 +02:00
..
boot	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
configs	x86/defconfig: Remove stale, old Kconfig options	2017-07-20 10:28:19 +02:00
crypto	crypto: x86/sha1 - Fix reads beyond the number of blocks passed	2017-08-09 20:01:37 +08:00
entry	x86/asm/64: Clear AC on NMI entries	2017-08-10 13:13:15 +02:00
events	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-08-20 09:36:52 -07:00
hyperv
ia32
include	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
kernel	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
kvm	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
lguest
lib	x86/boot: Add early cmdline parsing for options with arguments	2017-07-18 11:38:06 +02:00
math-emu	x86/fpu/math-emu: Avoid bogus -Wint-in-bool-context warning	2017-07-20 10:46:24 +02:00
mm	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
net
oprofile
pci
platform	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
power
purgatory
ras
realmode	x86/boot/realmode: Check for memory encryption on the APs	2017-07-18 11:38:04 +02:00
tools
um
video
xen	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
.gitignore
Kbuild
Kconfig	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
Kconfig.cpu
Kconfig.debug	x86/platform: Add PCI dependency for PUNIT_ATOM_DEBUG	2017-07-20 10:46:24 +02:00
Makefile
Makefile_32.cpu
Makefile.um