Linus Torvalds 45c091bb2d Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc ... * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (139 commits) [POWERPC] re-enable OProfile for iSeries, using timer interrupt [POWERPC] support ibm,extended-*-frequency properties [POWERPC] Extra sanity check in EEH code [POWERPC] Dont look for class-code in pci children [POWERPC] Fix mdelay badness on shared processor partitions [POWERPC] disable floating point exceptions for init [POWERPC] Unify ppc syscall tables [POWERPC] mpic: add support for serial mode interrupts [POWERPC] pseries: Print PCI slot location code on failure [POWERPC] spufs: one more fix for 64k pages [POWERPC] spufs: fail spu_create with invalid flags [POWERPC] spufs: clear class2 interrupt status before wakeup [POWERPC] spufs: fix Makefile for "make clean" [POWERPC] spufs: remove stop_code from struct spu [POWERPC] spufs: fix spu irq affinity setting [POWERPC] spufs: further abstract priv1 register access [POWERPC] spufs: split the Cell BE support into generic and platform dependant parts [POWERPC] spufs: dont try to access SPE channel 1 count [POWERPC] spufs: use kzalloc in create_spu [POWERPC] spufs: fix initial state of wbox file ... Manually resolved conflicts in: drivers/net/phy/Makefile include/asm-powerpc/spu.h		2006-06-22 22:11:30 -07:00
..
4xx_io	[PATCH] kzalloc() conversion in arch/ppc	2006-03-17 13:20:57 +11:00
8xx_io	[PATCH] Remove MODULE_PARM	2006-03-25 08:22:52 -08:00
8260_io	[PATCH] ppc: fix-up schedule_timeout() usage	2005-11-07 07:53:56 -08:00
amiga	[PATCH] powerpc: trivial: modify comments to refer to new location of files	2006-02-10 16:53:51 +11:00
boot	[PATCH] zlib_inflate: Upgrade library code to a recent version	2006-06-22 15:05:58 -07:00
configs	ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc	2006-03-28 10:22:10 +11:00
kernel	ppc: Fix typo in TI_LOCAL_FLAGS definition	2006-05-29 08:42:34 +10:00
lib	ppc: Fix compile error in arch/ppc/lib/strcase.c	2006-03-28 22:10:02 +11:00
mm	powerpc: Fix some missed ppc32 mm->context.id conversions	2006-06-13 13:43:00 +10:00
platforms	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
syslib	[PATCH] USB: allow multiple types of EHCI controllers to be built as modules	2006-06-21 15:04:09 -07:00
xmon	ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc	2006-03-28 10:22:10 +11:00
Kconfig	[PATCH] remove powerpc bitops in favor of existing generic bitops	2006-05-24 16:08:58 +10:00
Kconfig.debug	ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc	2006-03-28 10:22:10 +11:00
Makefile	Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc	2006-03-28 17:03:19 +11:00