Arjan van de Ven 651dab4264 Merge commit 'linus/master' into merge-linus ... Conflicts: arch/x86/kvm/i8254.c		2008-10-17 09:20:26 -07: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 branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	2008-10-16 15:36:00 -07:00
kernel	Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	2008-10-16 15:36:00 -07:00
kvm	KVM: switch to get_user_pages_fast	2008-10-15 14:25:06 +02: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	Merge commit 'linus/master' into merge-linus	2008-10-17 09:20:26 -07:00
platforms	Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-16 15:17:40 -07:00
sysdev	Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-16 15:17:40 -07:00
xmon	Merge branch 'linux-2.6'	2008-06-30 10:16:50 +10:00
Kconfig	Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2008-10-16 15:17:40 -07: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