Merge branch 'devel-stable' into for-next

diff --cc arch/arm/include/asm/glue-cache.h
Simple merge

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

diff --cc arch/arm/kernel/setup.c
index 0785472460a8dd168c96be3c6b84b5acd43bca97,04fd01feea86ed82672a406fa5343f6144023875..df6cd7307bd7e0c53b73569cf97a1c4c83a27db9
--- 1/arch/arm/kernel/setup.c
--- 2/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@@ -53,7 -55,11 +53,8 @@@
  #include <asm/traps.h>
  #include <asm/unwind.h>
  #include <asm/memblock.h>
+ #include <asm/virt.h>
  
 -#if defined(CONFIG_DEPRECATED_PARAM_STRUCT)
 -#include "compat.h"
 -#endif
  #include "atags.h"
  #include "tcm.h"
  

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

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