45c091bb2d
* 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 |
||
|---|---|---|
| .. | ||
| 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 | ||
| 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 | ||
| i2c-ocores.c | ||
| i2c-parport-light.c | ||
| i2c-parport.c | ||
| i2c-parport.h | ||
| i2c-pca-isa.c | ||
| i2c-piix4.c | ||
| 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 | ||
| Makefile | ||
| scx200_acb.c | ||
| scx200_i2c.c | ||