Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus

diff --cc arch/arm/include/asm/cputype.h
index 0d289240b6ca110ab961a280ddd20fc1c567f2a4,0d289240b6ca110ab961a280ddd20fc1c567f2a4,f6df4bb4e543f72cb9ce77ef14c5ac059701d603..775cac3c02bb0a31facb970e16feef83f86c6632
--- 1/arch/arm/include/asm/cputype.h
--- 2/arch/arm/include/asm/cputype.h
--- 3/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@@@ -105,12 -105,12 -106,8 +105,13 @@@@
   /* Qualcomm implemented cores */
   #define ARM_CPU_PART_SCORPION                0x510002d0
   
  +#ifndef __ASSEMBLY__
  +
  +#include <linux/stringify.h>
  +#include <linux/kernel.h>
  +
   extern unsigned int processor_id;
++ struct proc_info_list *lookup_processor(u32 midr);
   
   #ifdef CONFIG_CPU_CP15
   #define read_cpuid(reg)                                                      \

diff --cc arch/arm/kernel/setup.c
Simple merge

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

diff --cc arch/arm/mach-pxa/Kconfig
Simple merge

diff --cc arch/arm/mm/proc-v7.S
Simple merge

diff --cc arch/arm/vfp/vfpmodule.c
Simple merge