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

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

diff --cc arch/arm/mach-omap2/mailbox.c
Simple merge

diff --cc arch/arm/mach-omap2/timer-gp.c
index fb8d656e4d0a4f95a1ae893b7bafd4d215d6459d,0fc550e7e4825a04093a4e1980b1bd169f8cd893..3b9cf85f4bb94c9c2eee0afdfa0584d853b22be9
--- 1/arch/arm/mach-omap2/timer-gp.c
--- 2/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"
  

diff --cc drivers/usb/musb/musb_core.c
Simple merge

diff --cc drivers/usb/musb/musb_core.h
Simple merge