Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux...

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

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

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

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

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

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

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

diff --cc arch/arm/mach-omap2/timer.c
index e2084facca5926da73cd43c5e2e07725f70e79c2,2c5a45d8ca8c4102458ec5f0aa6a05fb8a812765..a9c9b3dbc82c5efaddeed94f870c6227cb2f96d8
--- 1/arch/arm/mach-omap2/timer.c
--- 2/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -36,19 -36,17 +36,20 @@@
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
  #include <linux/slab.h>
 +#include <linux/of.h>
  
  #include <asm/mach/time.h>
 -#include <plat/dmtimer.h>
  #include <asm/smp_twd.h>
  #include <asm/sched_clock.h>
 -#include "common.h"
 +
+ #include <asm/arch_timer.h>
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
 +#include <plat/dmtimer.h>
  #include <plat/omap-pm.h>
  
 +#include "soc.h"
 +#include "common.h"
  #include "powerdomain.h"
  
  /* Parent clocks, eventually these will come from the clock framework */

diff --cc arch/arm/plat-omap/sram.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge

diff --cc drivers/usb/gadget/u_serial.c
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge