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	[PATCH] kfree cleanup: arch	2005-11-07 07:54:06 -08:00
8260_io	[PATCH] ppc: fix-up schedule_timeout() usage	2005-11-07 07:53:56 -08:00
amiga	[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers	2006-01-12 09:09:05 -08:00
boot	[PATCH] ppc32: Put cache flush routines back into .relocate_code section	2006-01-09 15:47:08 +11:00
configs	[PATCH] ppc32: Add TQM85xx (8540/8541/8555/8560) board support	2006-01-09 14:53:08 +11:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge	2006-01-12 10:21:22 -08:00
lib	ppc32: use L1_CACHE_SHIFT/L1_CACHE_BYTES	2005-10-17 11:50:32 +10:00
math-emu	[PATCH] powerpc: Fix handling of fpscr on 64-bit	2005-10-27 20:48:50 +10:00
mm	[PATCH] ppc32 8xx: update_mmu_cache() needs unconditional tlbie	2005-11-16 13:28:22 +11:00
platforms	[PATCH] m68k: kill mach_floppy_setup, convert to proper __setup() in drivers	2006-01-12 09:09:05 -08:00
syslib	[PATCH] ppc32: m8xx watchdog update	2006-01-09 14:50:51 +11:00
xmon	[PATCH] scheduler cache-hot-autodetect	2006-01-12 09:08:50 -08:00
Kconfig	[PATCH] powerpc: Updated Kconfig and Makefiles for 83xx support	2006-01-11 15:35:29 +11:00
Kconfig.debug	[PATCH] ppc32: mv64x60 updates & enhancements	2005-09-05 00:06:00 -07:00
Makefile	kbuild: remove GCC_VERSION	2006-01-08 19:58:51 +01:00