Ingo Molnar 249d51b53a Merge commit 'v2.6.29-rc4' into core/percpu ... Conflicts: arch/x86/mach-voyager/voyager_smp.c arch/x86/mm/fault.c		2009-02-09 14:58:11 +01:00
..
boot	Merge commit 'jwb/jwb-merge' into merge	2009-01-28 17:15:34 +11:00
configs	powerpc/5200: update defconfigs	2009-01-29 17:08:38 -07:00
include/asm	powerpc/ps3: Use dma_addr_t down through the stack	2009-01-16 16:15:11 +11:00
kernel	Merge commit 'v2.6.29-rc4' into core/percpu	2009-02-09 14:58:11 +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: Fix handling of _PAGE_COHERENT in BAT setup code	2009-01-28 17:15:52 +11:00
oprofile	powerpc: Change u64/s64 to a long long integer type	2009-01-13 14:47:59 +11:00
platforms	Merge commit 'v2.6.29-rc4' into core/percpu	2009-02-09 14:58:11 +01:00
sysdev	Merge branch 'x86/mm' into core/percpu	2009-01-21 10:39:51 +01:00
xmon	powerpc: Prepare xmon_save_regs for use with kdump	2008-12-23 15:13:28 +11:00
Kconfig	powerpc: Remove arch/ppc cruft from Kconfig	2009-01-28 17:15:51 +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