From 087bd3d4920d276d7f27420a2ca30032df2dbc67 Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Fri, 2 Aug 2013 13:47:12 -0700
Subject: [PATCH] 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-format-patch failed