From: Tony Lindgren <tony@atomide.com>
Date: Thu, 3 Mar 2011 01:07:14 +0000 (-0800)
Subject: Merge branch 'devel-cleanup' into omap-for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=12d7d4e0ed8fecf7f74c89483b55b300be6e5901;p=linux.git

Merge branch 'devel-cleanup' into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/timer-gp.c
---

12d7d4e0ed8fecf7f74c89483b55b300be6e5901
diff --cc arch/arm/mach-omap2/timer-gp.c
index fb8d656e4d0a4,0fc550e7e4825..3b9cf85f4bb94
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@@ -39,8 -39,7 +39,9 @@@
  #include <asm/mach/time.h>
  #include <plat/dmtimer.h>
  #include <asm/localtimer.h>
+ #include <asm/sched_clock.h>
 +#include <plat/common.h>
 +#include <plat/omap_hwmod.h>
  
  #include "timer-gp.h"