Ingo Molnar af37501c79 Merge branch 'core/percpu' into perfcounters/core ...

Conflicts:
	arch/x86/include/asm/pda.h

We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.

Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-01-18 18:15:49 +01:00

..

audit.c

x86: coding style fixes in arch/x86/ia32/audit.c

2008-01-30 13:32:54 +01:00

ia32_aout.c

CRED: Make execve() take advantage of copy-on-write credentials

2008-11-14 10:39:24 +11:00

ia32_signal.c

x86: introducing asm/sys_ia32.h

2008-12-29 13:18:40 +01:00

ia32entry.S

Merge branch 'core/percpu' into perfcounters/core

2009-01-18 18:15:49 +01:00

ipc32.c

x86: introducing asm/sys_ia32.h

2008-12-29 13:18:40 +01:00

Makefile

x86: compat_binfmt_elf

2008-01-30 13:31:55 +01:00

sys_ia32.c

x86: introducing asm/sys_ia32.h

2008-12-29 13:18:40 +01:00