Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/x86/kernel/apic
History
Ingo Molnar 8460b3e5bc Merge commit 'v2.6.38' into x86/mm 
Conflicts:
	arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-03-15 08:29:44 +01:00
..
apic.c Merge commit 'v2.6.38' into x86/mm 2011-03-15 08:29:44 +01:00
apic_flat_64.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
apic_noop.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
bigsmp_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
es7000_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
hw_nmi.c x86, NMI: Remove DIE_NMI_IPI 2011-01-07 15:08:53 +01:00
io_apic.c x86, ioapic: Don't warn about non-existing IOAPICs if we have none 2011-02-15 04:15:04 +01:00
ipi.c x86: Always use x86_cpu_to_logical_apicid for cpu -> logical apic id 2011-01-28 14:54:05 +01:00
Makefile x86, nmi_watchdog: Remove the old nmi_watchdog 2010-11-18 09:08:23 +01:00
numaq_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
probe_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
probe_64.c x86: Enable the intr-remap fault handling after local APIC setup 2010-12-13 16:53:32 -08:00
summit_32.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
x2apic_cluster.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
x2apic_phys.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00
x2apic_uv_x.c x86: Replace apic->apicid_to_node() with ->x86_32_numa_cpu_node() 2011-01-28 14:54:08 +01:00