git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 18060f3) | patch
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)
commit087bd3d4920d276d7f27420a2ca30032df2dbc67
treecb4fa130d1bc4c9dacee1c5e68091fca300493a1tree | snapshot
parent18060f3541cf020d63340bf4c1f9fb82427a7a2acommit | diff
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>
arch/arm/mach-imx/Kconfig diff | blob | history
Pandora Kernel Repository