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
..
aztcd.c	[PATCH] Overrun in cdrom/aztcd.c	2006-04-11 06:18:46 -07:00
aztcd.h
cdrom.c	[PATCH] fix cdrom open	2006-06-17 10:44:26 -07:00
cdu31a.c	[PATCH] kill cdrom ->dev_ioctl method	2006-03-23 07:38:09 -08:00
cdu31a.h
cm206.c	[PATCH] Remove MODULE_PARM	2006-03-25 08:22:52 -08:00
cm206.h
gscd.c
gscd.h
isp16.c
isp16.h
Kconfig
Makefile
mcdx.c
mcdx.h
optcd.c
optcd.h
sbpcd.c	[PATCH] Remove MODULE_PARM	2006-03-25 08:22:52 -08:00
sbpcd.h
sjcd.c
sjcd.h
sonycd535.c
sonycd535.h
viocd.c	[PATCH] powerpc: update iSeries viocd and viotape device-tree	2006-05-19 14:35:31 +10:00