Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin' ... Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h		2008-10-15 11:31:54 +11:00
..
boot	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
configs	powerpc: disable CHRP and PMAC support in various defconfigs	2008-10-13 11:09:59 -05:00
include/asm	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
kernel	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
kvm	KVM: ppc: fix invalidation of large guest pages	2008-07-27 12:02:05 +03:00
lib	powerpc: Fix DMA offset for non-coherent DMA	2008-10-14 10:35:26 +11:00
math-emu	powerpc/math-emu: Use kernel generic math-emu code	2008-10-01 08:40:07 -05:00
mm	powerpc: Get USE_STRICT_MM_TYPECHECKS working again	2008-10-14 10:35:27 +11:00
oprofile	powerpc/cell/oprofile: Fix test on overlay_tbl_offset in vma_map	2008-10-10 15:55:18 +11:00
platforms	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
sysdev	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
xmon	Merge branch 'linux-2.6'	2008-06-30 10:16:50 +10:00
Kconfig	powerpc: Enforce sane MAX_ORDER	2008-10-07 14:26:20 +11:00
Kconfig.debug	powerpc: Split-out common MSI bitmap logic into msi_bitmap.c	2008-08-20 16:34:57 +10:00
Makefile	powerpc: Enforce a non-spe kernel build even on broken compilers	2008-09-15 11:08:41 -07:00