git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 18060f3)
ARM: imx: fix mismerge of localtimer code
authorOlof Johansson <olof@lixom.net>
Fri, 2 Aug 2013 20:47:12 +0000 (13:47 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 2 Aug 2013 20:47:15 +0000 (13:47 -0700)
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>

No differences found
Pandora Kernel Repository