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
..
Makefile	powerpc: make ARCH=ppc use arch/powerpc/kernel/process.c	2006-01-12 21:22:34 +11:00
asm-offsets.c	[PATCH] ppc: Make ARCH=ppc build again with new syscall path	2006-01-09 14:50:55 +11:00
cpu_setup_6xx.S	…
cpu_setup_power4.S	…
dma-mapping.c	…
entry.S	[PATCH] ppc: Make ARCH=ppc build again with new syscall path	2006-01-09 14:50:55 +11:00
head.S	…
head_4xx.S	…
head_8xx.S	…
head_44x.S	…
head_booke.h	[PATCH] ppc32: fix ppc44x fpu build	2005-11-10 11:24:06 +11:00
head_fsl_booke.S	[PATCH] Update email address for Kumar	2005-11-13 18:14:10 -08:00
idle.c	[PATCH] arch/ppc/kernel/idle.c: don't declare cpu variable in non-SMP kernels	2006-01-06 08:33:30 -08:00
idle_6xx.S	…
idle_power4.S	…
l2cr.S	…
machine_kexec.c	[PATCH] kdump: dynamic per cpu allocation of memory for saving cpu registers	2006-01-10 08:01:26 -08:00
misc.S	[PATCH] ppc: Make ARCH=ppc build again with new syscall path	2006-01-09 14:50:55 +11:00
module.c	…
pci.c	[PATCH] PCI: pci_find_device remove (ppc/kernel/pci.c)	2006-01-09 12:13:14 -08:00
perfmon_fsl_booke.c	…
ppc-stub.c	…
ppc_htab.c	[PATCH] capable/capability.h (arch/)	2006-01-11 18:42:14 -08:00
ppc_ksyms.c	[PATCH] spufs: The SPU file system, base	2006-01-09 14:49:12 +11:00
relocate_kernel.S	…
rio.c	…
semaphore.c	…
setup.c	[PATCH] powerpc: Unify udbg (#2)	2006-01-09 14:49:54 +11:00
smp-tbsync.c	…
smp.c	[PATCH] powerpc: task_thread_info()	2006-01-12 09:08:57 -08:00
softemu8xx.c	…
swsusp.S	…
temp.c	…
time.c	…
traps.c	[PATCH] ppc: Fix ARCH=ppc build with xmon	2005-11-08 11:19:48 +11:00
vmlinux.lds.S	…