From: Tony Lindgren <tony@atomide.com>
Date: Mon, 8 Apr 2013 18:25:09 +0000 (-0700)
Subject: Merge tag 'omap-for-v3.10/timer-signed' into omap-for-v3.10/tmp-merge
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c68c9da5465424ff1d59e46d45f5a8597c821597;p=pandora-kernel.git

Merge tag 'omap-for-v3.10/timer-signed' into omap-for-v3.10/tmp-merge

Clean-up for omap2+ timers from Jon Hunter <jon-hunter@ti.com>:

This series consists mainly of clean-ups for clockevents and
clocksource timers on OMAP2+ devices. The most significant change
in functionality comes from the 5th patch which is changing the
selection of the clocksource timer for OMAP3 and AM335x devices
when gptimers are used for clocksource.

Note that this series depends on 7185684 (ARM: OMAP: use
consistent error checking) in RMK's tree and 960cba6 (ARM:
OMAP5: timer: Update the clocksource name as per clock data)
in omap-for-v3.10/fixes-non-critical. So this branch is based
on a merge of 7185684 and omap-for-v3.10/fixes-non-critical
to avoid non-trivial merge conflicts.
---

c68c9da5465424ff1d59e46d45f5a8597c821597
Reading git-diff-tree failed