Merge from Linus' tree.

diff --cc arch/ppc/kernel/Makefile
Simple merge

diff --cc arch/ppc/kernel/perfmon.c
Simple merge

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

diff --cc arch/ppc64/Makefile
Simple merge

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

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

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

diff --cc arch/ppc64/mm/hash_native.c
index 29b074505d3eb0c544703d2d69d98640eb54fced,eb1bbb5b6c160bcf3b4e2e1a8f630951c3209be8..874cf96938fff05112539ed4afcc21640a75e595
--- 1/arch/ppc64/mm/hash_native.c
--- 2/arch/ppc64/mm/hash_native.c
+++ b/arch/ppc64/mm/hash_native.c
@@@ -350,7 -349,14 +348,8 @@@ static void native_flush_hash_range(uns
  
        j = 0;
        for (i = 0; i < number; i++) {
 -              if (batch->addr[i] < KERNELBASE)
 -                      vsid = get_vsid(context, batch->addr[i]);
 -              else
 -                      vsid = get_kernel_vsid(batch->addr[i]);
 -
 -              va = (vsid << 28) | (batch->addr[i] & 0x0fffffff);
 -              batch->vaddr[j] = va;
 +              va = batch->vaddr[j];
+               large = pte_huge(batch->pte[i]);
                if (large)
                        vpn = va >> HPAGE_SHIFT;
                else