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	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-ali1535.c	[PATCH] I2C: i2c-ali1535: Drop redundant mutex	2006-03-23 14:21:54 -08:00
i2c-ali1563.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-amd756-s4882.c	[PATCH] I2C: i2c-amd756-s4882: Improve static mutex initialization	2006-03-23 14:21:54 -08:00
i2c-amd756.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-amd8111.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-au1550.c	[PATCH] I2C: Kill i2c_algorithm.id (4/7)	2005-09-05 09:14:29 -07:00
i2c-au1550.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
i2c-elektor.c	[PATCH] i2c: Big i2c-elektor cleanup	2005-10-28 14:02:10 -07:00
i2c-hydra.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-i801.c	[PATCH] i2c-i801: Merge setup function	2006-06-22 11:10:35 -07:00
i2c-i810.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-ibm_iic.c	[PATCH] i2c: i2c-ibm_iic add I2C_CLASS_HWMON	2006-01-05 22:16:27 -08:00
i2c-ibm_iic.h	[PATCH] I2C: drivers/i2c/*: #include <linux/config.h> cleanup	2005-06-21 21:51:53 -07:00
i2c-iop3xx.c	[PATCH] handle errors returned by platform_get_irq*()	2006-03-20 13:42:57 -08:00
i2c-iop3xx.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
i2c-isa.c	[PATCH] i2c: Semaphore to mutex conversions, part 2	2006-03-23 14:21:51 -08:00
i2c-ite.c	[PATCH] i2c: Fix i2c-ite name initialization	2006-03-23 14:21:54 -08:00
i2c-ixp4xx.c	[PATCH] I2C: i2c-ixp4xx: Add hwmon class	2006-03-23 14:21:55 -08:00
i2c-ixp2000.c	[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms	2005-11-17 15:47:30 +00:00
i2c-mpc.c	[PATCH] handle errors returned by platform_get_irq*()	2006-03-20 13:42:57 -08:00
i2c-mv64xxx.c	[PATCH] handle errors returned by platform_get_irq*()	2006-03-20 13:42:57 -08:00
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	[PATCH] i2c-parport: Make type parameter mandatory	2006-04-14 11:18:34 -07:00
i2c-parport.c	[PATCH] i2c-parport: Make type parameter mandatory	2006-04-14 11:18:34 -07:00
i2c-parport.h	[PATCH] i2c-parport: Make type parameter mandatory	2006-04-14 11:18:34 -07:00
i2c-pca-isa.c	[PATCH] I2C: drivers/i2c/*: #include <linux/config.h> cleanup	2005-06-21 21:51:53 -07:00
i2c-piix4.c	[PATCH] I2C: i2c-piix4: Document the IBM problem more clearly	2006-06-22 11:10:32 -07:00
i2c-powermac.c	[PATCH] 2/5 powerpc: Rework PowerMac i2c part 2	2006-01-09 15:47:17 +11:00
i2c-prosavage.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-pxa.c	[PATCH] i2c: Semaphore to mutex conversions, part 3	2006-03-23 14:21:51 -08:00
i2c-rpx.c	[PATCH] I2C: drivers/i2c/*: #include <linux/config.h> cleanup	2005-06-21 21:51:53 -07:00
i2c-s3c2410.c	[ARM] Move asm/hardware/clock.h to linux/clk.h	2006-01-07 16:15:52 +00:00
i2c-savage4.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-sibyte.c	[PATCH] Build fix for the Sibyte I2C driver	2005-08-09 12:08:21 -07:00
i2c-sis96x.c	[PATCH] i2c-sis96x: Remove an init-time log message	2006-04-14 11:18:34 -07:00
i2c-sis630.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-sis5595.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-stub.c	[PATCH] I2C: Kill i2c_algorithm.id (4/7)	2005-09-05 09:14:29 -07:00
i2c-via.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-viapro.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
i2c-voodoo3.c	[PATCH] PCI: removed unneeded .owner field from struct pci_driver	2005-11-10 16:09:17 -08:00
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	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00