James Morris 2b82892565 Merge branch 'master' into next ... Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>		2008-11-14 11:29:12 +11:00
..
boot	powerpc/86xx: Correct SOC bus-frequency in GE Fanuc SBC610 DTS	2008-11-08 12:39:01 -06:00
configs	powerpc: Update desktop/server defconfigs	2008-11-11 19:42:30 +11:00
include/asm	powerpc: Update QE/CPM2 usb_ctlr structures for USB support	2008-11-08 12:39:02 -06:00
kernel	powerpc: Fix msr check in compat_sys_swapcontext	2008-11-11 19:42:22 +11: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	CRED: Wrap task credential accesses in the PowerPC arch	2008-11-14 10:38:39 +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-11-14 11:29:12 +11:00
sysdev	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-02 10:15:52 -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	powerpc: Split-out common MSI bitmap logic into msi_bitmap.c	2008-08-20 16:34:57 +10:00
Makefile	ftrace: rename FTRACE to FUNCTION_TRACER	2008-10-20 18:27:03 +02:00