From: Olof Johansson <olof@lixom.net>
Date: Fri, 11 May 2012 06:46:06 +0000 (-0700)
Subject: Merge tag 'omap-cleanup-timer-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~7366^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=030caf3f22395d564ee8a4f056a9cb7190a7eed4;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'omap-cleanup-timer-for-v3.5' of git://git./linux/kernel/git/tmlind/linux-omap into next/cleanup2

Timer changes to make it easier to support various SoCs

By Vaibhav Hiremath
via Tony Lindgren
* tag 'omap-cleanup-timer-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: Make OMAP clocksource source selection using kernel param
  ARM: OMAP2+: Replace space with underscore in the name field of system timers
  ARM: OMAP1: Add checks for possible error condition in timer_init
---

030caf3f22395d564ee8a4f056a9cb7190a7eed4