Merge branch 'devel-cleanup' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:07:14 +0000 (17:07 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 3 Mar 2011 01:07:14 +0000 (17:07 -0800)
Conflicts:
arch/arm/mach-omap2/timer-gp.c

1  2 
arch/arm/mach-omap2/mailbox.c
arch/arm/mach-omap2/timer-gp.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h

Simple merge
@@@ -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"
  
Simple merge
Simple merge