Ingo Molnar 191a66353b Merge branch 'x86/asm' into x86/apic, to resolve a conflict ... Conflicts: arch/x86/kernel/apic/io_apic.c arch/x86/kernel/apic/vector.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2015-05-11 16:05:09 +02:00
..
apei.c	acpi, apei, ghes: Factor out ioremap virtual memory for IRQ and NMI context.	2014-07-22 15:05:06 -07:00
boot.c	Merge branch 'x86/asm' into x86/apic, to resolve a conflict	2015-05-11 16:05:09 +02:00
cstate.c	ACPI idle: permit sparse C-state sub-state numbers	2014-02-19 17:33:18 -05:00
Makefile	apei, mce: Factor out APEI architecture specific MCE calls.	2014-07-22 15:05:06 -07:00
sleep.c	x86: Store a per-cpu shadow copy of CR4	2015-02-04 12:10:42 +01:00
sleep.h	ACPICA: Cleanup asmlinkage for ACPICA APIs.	2013-10-31 14:37:35 +01:00
wakeup_32.S	ACPICA: Cleanup asmlinkage for ACPICA APIs.	2013-10-31 14:37:35 +01:00
wakeup_64.S	x86/asm, x86/acpi/wakeup_64.S: Make global label a local one	2015-04-15 11:38:01 +02:00