From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Mon, 6 May 2013 23:39:16 +0000 (-0700)
Subject: ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
X-Git-Tag: omap-for-v3.10/fixes-for-merge-window~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=626479696d2b0c3a68a4fd24c3ee759c7d2b4ea1;p=pandora-kernel.git

ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a

Looks like the timer.c fixes in commit ff931c82 (ARM: OMAP: clocks:
Delay clk inits atleast until slab is initialized) got lost in a
merge with da4a686a (ARM: smp_twd: convert to use CLKSRC_OF init).

Without the omap_clk_init() calls none of OMAP family of devices
boot.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated comments to describe merge error]
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed