Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ... Conflicts: arch/mips/sibyte/bcm1480/irq.c arch/mips/sibyte/sb1250/irq.c Merge reason: we gathered a few conflicts plus update to latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-01 21:06:21 +02:00
..
boot	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-05-15 08:05:02 -07:00
configs	powerpc/ps3: Update ps3_defconfig	2009-05-18 15:19:05 +10:00
include/asm	powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.	2009-05-27 16:33:59 +10:00
kernel	powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.	2009-05-27 16:33:59 +10:00
kvm	KVM: ppc: e500: Fix the bug that KVM is unstable in SMP	2009-03-24 11:03:15 +02:00
lib	powerpc: Move dma-noncoherent.c from arch/powerpc/lib to arch/powerpc/mm	2009-05-27 16:32:05 +10:00
math-emu	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00
mm	powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.	2009-05-27 16:33:59 +10:00
oprofile	powerpc: Fix oprofile sampling of marked events on POWER7	2009-05-15 16:43:41 +10:00
platforms	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
sysdev	Merge branch 'linus' into irq/numa	2009-06-01 21:06:21 +02:00
xmon
Kconfig	powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency.	2009-05-27 16:33:59 +10:00
Kconfig.debug	generic debug pagealloc: build fix	2009-04-02 19:04:48 -07:00
Makefile	powerpc/math-emu: Fix efp dependence	2009-03-11 06:00:08 -05:00