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
..
device_libs	x86/irq: Convert IOAPIC to use hierarchical irqdomain interfaces	2015-04-24 15:36:51 +02:00
intel_mid_vrtc.c	kernel.h: remove ancient __FUNCTION__ hack	2015-02-12 18:54:13 -08:00
intel_mid_weak_decls.h	x86, intel-mid: Remove "weak" from function declarations	2014-10-22 16:14:03 -06:00
intel-mid.c	x86/intel-mid: Delay initialization of APB timer	2015-04-24 15:36:51 +02:00
Makefile	x86, intel-mid: remove Intel MID specific serial support	2015-03-07 03:25:18 +01:00
mfld.c	x86, intel-mid: Add missing 'void' to functions without arguments	2014-01-22 14:30:02 -08:00
mrfl.c	x86, intel-mid: Add missing 'void' to functions without arguments	2014-01-22 14:30:02 -08:00
sfi.c	x86/irq: Convert IOAPIC to use hierarchical irqdomain interfaces	2015-04-24 15:36:51 +02:00