Merge branch 'merge' into next

Merge a pile of fixes that went into the "merge" branch (3.13-rc's) such
as Anton Little Endian fixes.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

diff --cc arch/powerpc/include/asm/exception-64s.h
Simple merge

diff --cc arch/powerpc/include/asm/opal.h
Simple merge

diff --cc arch/powerpc/kernel/misc_64.S
Simple merge

diff --cc arch/powerpc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/eeh-ioda.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
index 614356cac4665699f5be02ce7ceb603417b7a6a8,2c6d173842b2f1056d3702826b3c2a1d84d614ad..f0e68714696e5acb4140cc09fc2829cc23f0217f
--- 1/arch/powerpc/platforms/powernv/pci-ioda.c
--- 2/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@@ -720,9 -720,10 +720,10 @@@ static void pnv_pci_ioda2_setup_dma_pe(
                tbl->it_type = TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE;
        }
        iommu_init_table(tbl, phb->hose->node);
+       iommu_register_group(tbl, pci_domain_nr(pe->pbus), pe->pe_number);
  
        if (pe->pdev)
 -              set_iommu_table_base(&pe->pdev->dev, tbl);
 +              set_iommu_table_base_and_group(&pe->pdev->dev, tbl);
        else
                pnv_ioda_setup_bus_dma(pe, pe->pbus);
  

diff --cc arch/powerpc/platforms/powernv/pci.h
index 9a11ff0c5c0b4b65d461f0120cc88f6cf7a75589,1ed8d5f40f5ad1423f78c9ae7fdac42abac4376d..13f1942a9a5f98708038808a2d816f2bec0d6e1a
--- 1/arch/powerpc/platforms/powernv/pci.h
--- 2/arch/powerpc/platforms/powernv/pci.h
+++ b/arch/powerpc/platforms/powernv/pci.h
@@@ -176,8 -176,9 +176,10 @@@ struct pnv_phb 
        union {
                unsigned char                   blob[PNV_PCI_DIAG_BUF_SIZE];
                struct OpalIoP7IOCPhbErrorData  p7ioc;
 +              struct OpalIoPhb3ErrorData      phb3;
+               struct OpalIoP7IOCErrorData     hub_diag;
        } diag;
+ 
  };
  
  extern struct pci_ops pnv_pci_ops;