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
..
boot	[WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610	2009-01-12 20:08:47 +00:00
configs	[WATCHDOG] Enable watchdog timer on GE Fanuc's SBC610	2009-01-12 20:08:47 +00:00
include/asm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core	2009-01-11 02:44:08 +01:00
kernel	Merge branch 'core/percpu' into perfcounters/core	2009-01-18 18:15:49 +01:00
kvm	KVM: Consolidate userspace memory capability reporting into common code	2008-12-31 16:55:46 +02:00
lib	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2008-12-28 16:54:33 -08:00
math-emu	powerpc: Add SPE/EFP math emulation for E500v1/v2 processors.	2008-12-03 08:19:16 -06:00
mm	powerpc/mm: Make clear_fixmap() actually work	2009-01-08 16:25:17 +11:00
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile	2009-01-09 12:43:06 -08:00
platforms	Merge branch 'core/percpu' into perfcounters/core	2009-01-18 18:15:49 +01:00
sysdev	irq: update all arches for new irq_desc	2009-01-12 15:27:13 -08:00
xmon	powerpc: Prepare xmon_save_regs for use with kdump	2008-12-23 15:13:28 +11:00
Kconfig	powerpc: enable dynamic ftrace	2009-01-08 16:25:18 +11:00
Kconfig.debug	powerpc: Allow the max stack trace depth to be configured	2008-12-03 20:46:35 +11:00
Makefile	powerpc: Remove unncessary SPE related compiler flag	2008-12-03 08:19:10 -06:00