Merge from Linus' tree

diff --cc arch/powerpc/platforms/pseries/pci.c
index 2dd477e,928f8fe..c198656
--- 1/arch/powerpc/platforms/pseries/pci.c
--- 2/arch/ppc64/kernel/pSeries_pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@@ -29,9 -29,10 +29,9 @@@
  
  #include <asm/pci-bridge.h>
  #include <asm/prom.h>
 -
 -#include "pci.h"
 +#include <asm/ppc-pci.h>
  
- static int __initdata s7a_workaround = -1;
+ static int __devinitdata s7a_workaround = -1;
  
  #if 0
  void pcibios_name_device(struct pci_dev *dev)

diff --cc arch/ppc/platforms/4xx/ebony.c
Simple merge

diff --cc arch/ppc/platforms/chestnut.c
Simple merge

diff --cc arch/ppc/platforms/chrp_setup.c
Simple merge

diff --cc arch/ppc/platforms/gemini_setup.c
Simple merge

diff --cc arch/ppc/platforms/pmac_cpufreq.c
Simple merge

diff --cc arch/ppc/platforms/pmac_feature.c
Simple merge

diff --cc arch/ppc/platforms/pmac_setup.c
Simple merge

diff --cc arch/ppc/platforms/pmac_time.c
Simple merge

diff --cc arch/ppc/platforms/pplus.c
Simple merge

diff --cc arch/ppc/platforms/radstone_ppc7d.c
Simple merge

diff --cc arch/ppc/platforms/sandpoint.c
Simple merge

diff --cc arch/ppc/syslib/open_pic.c
Simple merge

diff --cc arch/ppc/syslib/open_pic2.c
Simple merge

diff --cc arch/ppc/syslib/ppc4xx_setup.c
Simple merge

diff --cc arch/ppc64/kernel/bpa_iommu.c
Simple merge

diff --cc arch/ppc64/kernel/kprobes.c
Simple merge

diff --cc arch/ppc64/kernel/pci_direct_iommu.c
index 57980a5,54055c8..e1a32f8
--- 1/arch/ppc64/kernel/pci_direct_iommu.c
--- 2/arch/ppc64/kernel/pci_direct_iommu.c
+++ b/arch/ppc64/kernel/pci_direct_iommu.c
@@@ -27,10 -27,11 +27,10 @@@
  #include <asm/machdep.h>
  #include <asm/pmac_feature.h>
  #include <asm/abs_addr.h>
 -
 -#include "pci.h"
 +#include <asm/ppc-pci.h>
  
  static void *pci_direct_alloc_coherent(struct device *hwdev, size_t size,
-                                  dma_addr_t *dma_handle, unsigned int __nocast flag)
+                                  dma_addr_t *dma_handle, gfp_t flag)
  {
        void *ret;
  

diff --cc arch/ppc64/kernel/pci_iommu.c
Simple merge

diff --cc drivers/macintosh/smu.c
Simple merge

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

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