Merge branch 'cleanup' into for-linus

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c

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

diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index f264ddddd47c395404203cdebf43b7dc2206abb0,8036ad8ab046989bd4fda4380290d73af7b5bf3d..5823a2e651249a15e57a7ac05bc5d27f8c3db3a8
--- 1/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
--- 2/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@@ -38,9 -37,9 +37,10 @@@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
 -#include <asm/system.h>
 +#include <asm/system_info.h>
+ #include <asm/memblock.h>
  #include <mach/common.h>
 +#include <mach/hardware.h>
  #include <mach/iomux-mx27.h>
  
  #include "devices-imx27.h"