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

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


Trivial merge