]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'cleanup' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:28 +0000 (23:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
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
index f264ddddd47c395404203cdebf43b7dc2206abb0,8036ad8ab046989bd4fda4380290d73af7b5bf3d..5823a2e651249a15e57a7ac05bc5d27f8c3db3a8
  #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"