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
..
dart_iommu.c	[POWERPC] node local IOMMU tables	2006-06-15 19:31:26 +10:00
dart.h
dcr.S	[PATCH] powerpc: trivial: modify comments to refer to new location of files	2006-02-10 16:53:51 +11:00
fsl_soc.c	[PATCH] USB: allow multiple types of EHCI controllers to be built as modules	2006-06-21 15:04:09 -07:00
fsl_soc.h
grackle.c
i8259.c
indirect_pci.c
ipic.c
ipic.h	[PATCH] powerpc: trivial: modify comments to refer to new location of files	2006-02-10 16:53:51 +11:00
Makefile	[POWERPC] Optimise some TOC usage	2006-06-15 19:31:25 +10:00
mmio_nvram.c
mpic.c	[POWERPC] mpic: add support for serial mode interrupts	2006-06-21 15:01:32 +10:00