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
..
i2c-ali15x3.c
i2c-ali1535.c
i2c-ali1563.c
i2c-amd756-s4882.c
i2c-amd756.c
i2c-amd8111.c
i2c-au1550.c
i2c-au1550.h
i2c-elektor.c
i2c-hydra.c
i2c-i801.c	[PATCH] i2c-i801: Merge setup function	2006-06-22 11:10:35 -07:00
i2c-i810.c
i2c-ibm_iic.c
i2c-ibm_iic.h
i2c-iop3xx.c
i2c-iop3xx.h
i2c-isa.c
i2c-ite.c
i2c-ixp4xx.c
i2c-ixp2000.c
i2c-mpc.c
i2c-mv64xxx.c
i2c-nforce2.c	[PATCH] I2C: i2c-nforce2: Add support for the nForce4 MCP51 and MCP55	2006-06-22 11:10:33 -07:00
i2c-ocores.c	[PATCH] i2c-ocores: Minor cleanups	2006-06-22 11:10:34 -07:00
i2c-parport-light.c
i2c-parport.c
i2c-parport.h
i2c-pca-isa.c
i2c-piix4.c	[PATCH] I2C: i2c-piix4: Document the IBM problem more clearly	2006-06-22 11:10:32 -07:00
i2c-powermac.c
i2c-prosavage.c
i2c-pxa.c
i2c-rpx.c
i2c-s3c2410.c
i2c-savage4.c
i2c-sibyte.c
i2c-sis96x.c
i2c-sis630.c
i2c-sis5595.c
i2c-stub.c
i2c-via.c
i2c-viapro.c
i2c-voodoo3.c
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
Makefile	[PATCH] i2c: New bus driver for the OpenCores I2C controller	2006-06-22 11:10:33 -07:00
scx200_acb.c	[PATCH] scx200_acb: Mark scx200_acb_probe __init	2006-06-22 11:10:35 -07:00
scx200_i2c.c