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

diff --cc arch/powerpc/mm/hash_native_64.c
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/ibmveth.c
Simple merge

diff --cc drivers/net/phy/Kconfig
index cda3e53d69176f803e471cdfad71892ad371f95b,76e51b1baf11f9dae9cd8d5d0a031e82fd381f08..2ba6d3a40e2ee5b2caf4347324a93a74a6665b44
--- 1/drivers/net/phy/Kconfig
--- 2/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@@ -44,12 -44,11 +44,17 @@@ config CICADA_PH
        depends on PHYLIB
        ---help---
          Currently supports the cis8204
+ config VITESSE_PHY
+         tristate "Drivers for the Vitesse PHYs"
+         depends on PHYLIB
+         ---help---
+           Currently supports the vsc8244
  
 +config SMSC_PHY
 +      tristate "Drivers for SMSC PHYs"
 +      depends on PHYLIB
 +      ---help---
 +        Currently supports the LAN83C185 PHY
 +
  endmenu
  

diff --cc drivers/net/phy/Makefile
index d9614134cc06d674e2ef08fd01f88dcb941ab77d,a8d066eab6af9bb5f7367d68c4df3261f082814c..a00e61942525aa0d8eed8b02552b31efa38fa27f
--- 1/drivers/net/phy/Makefile
--- 2/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@@ -8,4 -8,4 +8,5 @@@ obj-$(CONFIG_DAVICOM_PHY)        += davicom.
  obj-$(CONFIG_CICADA_PHY)      += cicada.o
  obj-$(CONFIG_LXT_PHY)         += lxt.o
  obj-$(CONFIG_QSEMI_PHY)               += qsemi.o
 +obj-$(CONFIG_SMSC_PHY)                += smsc.o
+ obj-$(CONFIG_VITESSE_PHY)     += vitesse.o

diff --cc include/asm-powerpc/cputable.h
Simple merge

diff --cc include/asm-powerpc/eeh.h
Simple merge

diff --cc include/asm-powerpc/elf.h
Simple merge

diff --cc include/asm-powerpc/iommu.h
Simple merge

diff --cc include/asm-powerpc/irq.h
Simple merge

diff --cc include/asm-powerpc/machdep.h
Simple merge

diff --cc include/asm-powerpc/paca.h
Simple merge

diff --cc include/asm-powerpc/page.h
index f0469b9613590c7f6524ce8bf79f837d3fc3f5cd,a315d0c0d96a964d22c81e4946bdedd565c42d4d..fb597b37c2a2f0deaeadf8cf303105f632fb9aa6
--- 1/include/asm-powerpc/page.h
--- 2/include/asm-powerpc/page.h
+++ b/include/asm-powerpc/page.h
@@@ -11,7 -11,9 +11,8 @@@
   */
  
  #ifdef __KERNEL__
 -#include <linux/config.h>
  #include <asm/asm-compat.h>
+ #include <asm/kdump.h>
  
  /*
   * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software

diff --cc include/asm-powerpc/pgtable.h
Simple merge

diff --cc include/asm-powerpc/prom.h
Simple merge

diff --cc include/asm-powerpc/spu.h
index 95713f397357d62d63d6163a8ffb677f3b1f3fe9,c0290f9d20bd50a345852bc2bbdb03d7ca1135c4..9609d3ee8798a18fc2ea49994c28b362fd612051
--- 1/include/asm-powerpc/spu.h
--- 2/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@@ -24,8 -24,9 +24,8 @@@
  #define _SPU_H
  #ifdef __KERNEL__
  
- #include <linux/kref.h>
 -#include <linux/config.h>
  #include <linux/workqueue.h>
+ #include <linux/sysdev.h>
  
  #define LS_SIZE (256 * 1024)
  #define LS_ADDR_MASK (LS_SIZE - 1)

diff --cc include/asm-powerpc/topology.h
Simple merge

diff --cc include/asm-powerpc/vio.h
Simple merge

diff --cc include/asm-ppc/mmu.h
Simple merge

diff --cc include/asm-ppc/mmu_context.h
Simple merge

diff --cc include/asm-ppc/mpc85xx.h
Simple merge

diff --cc include/asm-ppc/pgtable.h
Simple merge

diff --cc kernel/sys.c
Simple merge