Merge tag 'omap-cleanup-timer-for-v3.5' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 18:17:53 +0000 (11:17 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 18:17:53 +0000 (11:17 -0700)
Timer changes to make it easier to support various SoCs

Conflicts:
arch/arm/mach-omap1/common.h


Trivial merge