Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc arch/arm64/kernel/setup.c
index 05757983626d3f4aa5e6b45a786ad783a8c1f9da,bb99e3a5ac561f82d3696c346925901201db30b4..bb9e709879c350434fc9a157c4e2e09c3d5c7881
--- 1/arch/arm64/kernel/setup.c
--- 2/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@@ -196,13 -116,7 +196,8 @@@ static void __init smp_build_mpidr_hash
  static void __init setup_processor(void)
  {
        struct cpu_info *cpu_info;
 +      u64 features, block;
  
-       /*
-        * locate processor in the list of supported processor
-        * types.  The linker builds this table for us from the
-        * entries in arch/arm/mm/proc.S
-        */
        cpu_info = lookup_processor_type(read_cpuid_id());
        if (!cpu_info) {
                printk("CPU configuration botched (ID %08x), unable to continue.\n",