Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:11:30 +0000 (22:11 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 05:11:30 +0000 (22:11 -0700)
commit45c091bb2d453ce4a8b06cf19872ec7a77fc4799
tree06fb2e05518ebfba163f8424e028e7faf5672d66
parentd588fcbe5a7ba8bba2cebf7799ab2d573717a806
parent2191fe3e39159e3375f4b7ec1420df149f154101
Merge git://git./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
24 files changed:
arch/powerpc/mm/hash_native_64.c
drivers/i2c/busses/Kconfig
drivers/net/Kconfig
drivers/net/ibmveth.c
drivers/net/phy/Kconfig
drivers/net/phy/Makefile
include/asm-powerpc/cputable.h
include/asm-powerpc/eeh.h
include/asm-powerpc/elf.h
include/asm-powerpc/iommu.h
include/asm-powerpc/irq.h
include/asm-powerpc/machdep.h
include/asm-powerpc/paca.h
include/asm-powerpc/page.h
include/asm-powerpc/pgtable.h
include/asm-powerpc/prom.h
include/asm-powerpc/spu.h
include/asm-powerpc/topology.h
include/asm-powerpc/vio.h
include/asm-ppc/mmu.h
include/asm-ppc/mmu_context.h
include/asm-ppc/mpc85xx.h
include/asm-ppc/pgtable.h
kernel/sys.c