diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-12-13 21:09:19 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-13 21:09:19 +0200 |
| commit | aa77e00f0e6ae7e4d3e1a813a326800e8d7f5bcf (patch) | |
| tree | 44b6460b74154f0d28d43335c934842b21a0e3ba /drivers/clocksource/arm_arch_timer.c | |
| parent | 8102b85e3faf04bca28962ad5e351a8f6e96e1d4 (diff) | |
scripts/setlocalversion: Fix mismerge
Change-Id: I1acce8bda6c60e8212808810d9e834827cc69cc7
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
0 files changed, 0 insertions, 0 deletions