Linus Torvalds 45bfe98bd7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge ... Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's gone, gone, gone). Signed-off-by: Linus Torvalds <torvalds@osdl.org>		2006-01-12 10:21:22 -08:00
..
spufs	[PATCH] powerpc: cell namespace cleanup	2006-01-12 20:39:14 +11:00
interrupt.c	[PATCH] spufs: set irq affinity for running threads	2006-01-09 15:44:57 +11:00
interrupt.h	[PATCH] spufs: set irq affinity for running threads	2006-01-09 15:44:57 +11:00
iommu.c	[PATCH] powerpc/cell: add iommu support for larger memory	2006-01-09 14:53:24 +11:00
iommu.h	[PATCH] powerpc: move arch/ppc64/kernel/bpa* to arch/powerpc/platforms/cell	2005-11-01 21:03:07 +11:00
Kconfig	[PATCH] spufs: The SPU file system, base	2006-01-09 14:49:12 +11:00
Makefile	[PATCH] spufs: abstract priv1 register access.	2006-01-09 15:44:49 +11:00
pervasive.c	[PATCH] powerpc: cell namespace cleanup	2006-01-12 20:39:14 +11:00
pervasive.h	[PATCH] cell: enable pause(0) in cpu_idle	2006-01-09 15:44:32 +11:00
setup.c	[PATCH] powerpc: cell namespace cleanup	2006-01-12 20:39:14 +11:00
smp.c	[PATCH] powerpc: task_thread_info()	2006-01-12 09:08:57 -08:00
spider-pic.c	[PATCH] powerpc: move arch/ppc64/kernel/bpa* to arch/powerpc/platforms/cell	2005-11-01 21:03:07 +11:00
spu_base.c	[PATCH] spufs: set irq affinity for running threads	2006-01-09 15:44:57 +11:00
spu_priv1.c	[PATCH] spufs: abstract priv1 register access.	2006-01-09 15:44:49 +11:00
spu_syscalls.c	[PATCH] spufs: fix module refcount race	2006-01-09 14:53:11 +11:00