Ingo Molnar a3d06cc6aa Merge branch 'linus' into perfcounters/core ... Conflicts: arch/x86/include/asm/kmap_types.h include/linux/mm.h include/asm-generic/kmap_types.h Merge reason: We crossed changes with kmap_types.h cleanups in mainline. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-17 13:06:17 +02:00
..
boot	powerpc/install: Bail with error code on error in install script	2009-06-15 13:26:16 +10:00
configs	Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2009-06-16 11:29:17 -07:00
include/asm	Merge branch 'linus' into perfcounters/core	2009-06-17 13:06:17 +02:00
kernel	Merge branch 'linus' into perfcounters/core	2009-06-17 13:06:17 +02:00
kvm	KVM: Fix interrupt unhalting a vcpu when it shouldn't	2009-06-10 11:48:33 +03: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
mm	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-06-15 09:32:52 -07:00
oprofile	powerpc/oprofile: Remove unused dump_pmcs() in FSL oprofile	2009-05-19 00:46:13 -05:00
platforms	Merge branch 'akpm'	2009-06-16 19:50:13 -07:00
sysdev	Merge commit 'origin/master' into next	2009-06-12 16:53:38 +10:00
xmon	powerpc/xmon: Remove unused variable in xmon.c	2009-06-09 16:47:40 +10:00
Kconfig	powerpc: Use generic atomic64_t implementation on 32-bit processors	2009-06-15 13:27:38 +10:00
Kconfig.debug	powerpc: Keep track of emulated instructions	2009-05-21 15:44:26 +10:00
Makefile	powerpc: Move VMX and VSX asm code to vector.S	2009-06-09 16:46:25 +10:00