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
..
apei.c	ACPI / APEI / ARM64: APEI initial support for ARM64	2016-12-02 00:24:34 +01:00
boot.c	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
cppc_msr.c	ACPI / CPPC: Add support for functional fixed hardware address	2016-09-08 23:02:14 +02:00
cstate.c	x86/ACPI/cstate: Allow ACPI C1 FFH MWAIT use on AMD systems	2017-06-27 02:00:52 +02:00
Makefile	objtool, x86: Add several functions and files to the objtool whitelist	2017-06-30 10:19:19 +02:00
sleep.c	x86: Remap GDT tables in the fixmap section	2017-03-16 09:06:35 +01:00
sleep.h	ACPICA: Cleanup asmlinkage for ACPICA APIs.	2013-10-31 14:37:35 +01:00
wakeup_32.S	x86: Load __USER_DS into DS/ES after resume	2015-06-22 14:40:03 +02:00
wakeup_64.S	x86/suspend: fix false positive KASAN warning on suspend/resume	2016-12-06 02:22:44 +01:00