| commit | 087bd3d4920d276d7f27420a2ca30032df2dbc67 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Aug 02 13:47:12 2013 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Aug 02 13:47:15 2013 -0700 |
| tree | cb4fa130d1bc4c9dacee1c5e68091fca300493a1 | |
| parent | 18060f3541cf020d63340bf4c1f9fb82427a7a2a [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>