From: Olof Johansson <olof@lixom.net>
Date: Fri, 2 Aug 2013 20:47:12 +0000 (-0700)
Subject: ARM: imx: fix mismerge of localtimer code
X-Git-Tag: v3.12-rc1~117^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=087bd3d4920d276d7f27420a2ca30032df2dbc67;p=pandora-kernel.git

ARM: imx: fix mismerge of localtimer code

I mis-resolved a merge conflict due to the branch being a bit on the old side,
Stephen noticed. Here's the fix.

Reported-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
---

Reading git-diff-tree failed