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
..
algos	[PATCH] i2c: Use module_param in i2c-algo-sibyte	2006-02-06 12:02:15 -08:00
busses	Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc	2006-06-22 22:11:30 -07:00
chips	[PATCH] i2c: Suggest N for rare devices in Kconfig	2006-06-22 11:10:33 -07:00
i2c-core.c	[PATCH] i2c: Mark block write buffers as const	2006-06-22 11:10:34 -07:00
i2c-dev.c	[PATCH] I2C: I2C controllers go into right place on sysfs	2006-06-22 11:10:36 -07:00
Kconfig
Makefile	[PATCH] hwmon: hwmon vs i2c, second round (07/11)	2005-09-05 09:14:22 -07:00