Ingo Molnar
f541ae326f
Merge branch 'linus' into perfcounters/core-v2
...
Merge reason: we have gathered quite a few conflicts, need to merge upstream
Conflicts:
arch/powerpc/kernel/Makefile
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/hardirq.h
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/cpu/common.c
arch/x86/kernel/irq.c
arch/x86/kernel/syscall_table_32.S
arch/x86/mm/iomap_32.c
include/linux/sched.h
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-04-06 09:02:57 +02:00
..
apic.c
Merge branch 'linus' into perfcounters/core-v2
2009-04-06 09:02:57 +02:00
apic_flat_64.c
x86: use default_cpu_mask_to_apicid for 64bit
2009-03-24 22:28:38 +01:00
bigsmp_32.c
cpumask: use new cpumask functions throughout x86
2009-03-13 14:49:54 +10:30
es7000_32.c
cpumask: remove x86 cpumask_t uses.
2009-03-13 14:49:57 +10:30
io_apic.c
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2009-04-01 09:47:12 -07:00
ipi.c
x86, apic: move APIC drivers to arch/x86/kernel/apic/*
2009-02-17 18:17:36 +01:00
Makefile
x86, apic: separate 32-bit setup functionality out of apic_32.c
2009-02-17 23:12:48 +01:00
nmi.c
cpumask: convert arch/x86/kernel/nmi.c's backtrace_mask to a cpumask_var_t
2009-03-13 14:49:49 +10:30
numaq_32.c
cpumask: remove x86 cpumask_t uses.
2009-03-13 14:49:57 +10:30
probe_32.c
cpumask: remove cpumask_t assignment from vector_allocation_domain()
2009-03-13 14:49:56 +10:30
probe_64.c
x86, x2apic: cleanup ifdef CONFIG_INTR_REMAP in io_apic code
2009-03-17 15:45:07 -07:00
summit_32.c
cpumask: remove x86 cpumask_t uses.
2009-03-13 14:49:57 +10:30
x2apic_cluster.c
x86: add x2apic_wrmsr_fence() to x2apic flush tlb paths
2009-03-18 09:36:14 +01:00
x2apic_phys.c
x86: add x2apic_wrmsr_fence() to x2apic flush tlb paths
2009-03-18 09:36:14 +01:00
x2apic_uv_x.c
sgi-gru: add macros for using the UV hub to send interrupts
2009-04-02 19:05:05 -07:00