James Morris ec98ce480a Merge branch 'master' into next ... Conflicts: fs/nfsd/nfs4recover.c Manually fixed above to use new creds API functions, e.g. nfs4_save_creds(). Signed-off-by: James Morris <jmorris@namei.org>		2008-12-04 17:16:36 +11:00
..
boot	powerpc/83xx: Fix MCU support merge issue in mpc8349emitx.dts	2008-12-03 09:56:02 -06:00
configs	Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge	2008-11-24 11:53:44 +11:00
include/asm	Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm	2008-12-02 15:56:17 -08:00
kernel	powerpc: Fix dma_map_sg() cache flushing on non coherent platforms	2008-12-03 18:24:08 +11:00
kvm	KVM: ppc: stop leaking host memory on VM exit	2008-11-25 12:02:48 +02:00
lib
math-emu
mm	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
oprofile	powerpc/cell/OProfile: Fix on-stack array size in activate spu profiling function	2008-10-31 16:13:51 +11:00
platforms	Merge branch 'master' into next	2008-12-04 17:16:36 +11:00
sysdev	powerpc: Use physical cpu id when setting the processor affinity	2008-12-02 15:50:40 -08:00
xmon	powerpc: Fix compile errors with CONFIG_BUG=n	2008-10-31 21:34:09 +11:00
Kconfig	Merge commit 'v2.6.28-rc2' into tracing/urgent	2008-10-27 10:50:54 +01:00
Kconfig.debug
Makefile	ftrace: rename FTRACE to FUNCTION_TRACER	2008-10-20 18:27:03 +02:00