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
..
4xx_io	[PATCH] capable/capability.h (arch/)	2006-01-11 18:42:14 -08:00
8xx_io
8260_io
amiga	[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers	2006-01-12 09:09:05 -08:00
boot
configs
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge	2006-01-12 10:21:22 -08:00
lib
math-emu
mm
platforms	[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers	2006-01-12 09:09:05 -08:00
syslib
xmon	[PATCH] scheduler cache-hot-autodetect	2006-01-12 09:08:50 -08:00
Kconfig
Kconfig.debug
Makefile