Merge branch 'cleanup' into for-linus
Russell King [Thu, 4 Oct 2012 22:01:28 +0000 (23:01 +0100)]
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c

1  2 
arch/arm/include/asm/thread_info.h
arch/arm/mach-imx/mach-imx27_visstrim_m10.c

Simple merge
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
 +#include <asm/system_info.h>
+ #include <asm/memblock.h>
 -#include <asm/system.h>
  #include <mach/common.h>
 +#include <mach/hardware.h>
  #include <mach/iomux-mx27.h>
  
  #include "devices-imx27.h"