From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 4 Oct 2012 22:01:28 +0000 (+0100)
Subject: Merge branch 'cleanup' into for-linus
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=43a60c1792b13eed49220af0e1344bf48e3a0677;p=linux-edison.git

Merge branch 'cleanup' into for-linus

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

43a60c1792b13eed49220af0e1344bf48e3a0677
diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index f264ddddd47,8036ad8ab04..5823a2e6512
--- a/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_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"