projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d7614f 9fc31dd)
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 patch | diff1 | diff2 | blob | history
arch/arm/mach-imx/mach-imx27_visstrim_m10.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/include/asm/thread_info.h
Simple merge
diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index f264ddd,8036ad8..5823a2e
--- 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"
Domain: System / Uncategorized;