Merge remote-tracking branch 'scott/next' into next

Scott writes:

Highlights include e6500 hardware threading support, an e6500 TLB erratum
workaround, corenet error reporting, support for a new board, and some
minor fixes.

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

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

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

diff --cc arch/powerpc/kernel/setup-common.c
index e5b022c,1bb4dcd..1b0e260
--- 1/arch/powerpc/kernel/setup-common.c
--- 2/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@@ -468,18 -468,12 +468,20 @@@ void __init smp_setup_cpu_maps(void
                        }
                }
  
+               nthreads = len / sizeof(int);
+ 
                for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {
 +                      bool avail;
 +
                        DBG("    thread %d -> cpu %d (hard id %d)\n",
                            j, cpu, be32_to_cpu(intserv[j]));
 -                      set_cpu_present(cpu, of_device_is_available(dn));
 +
 +                      avail = of_device_is_available(dn);
 +                      if (!avail)
 +                              avail = !of_property_match_string(dn,
 +                                              "enable-method", "spin-table");
 +
 +                      set_cpu_present(cpu, avail);
                        set_hard_smp_processor_id(cpu, be32_to_cpu(intserv[j]));
                        set_cpu_possible(cpu, true);
                        cpu++;

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