arm64: arch_timer: Fix mismerge
authorMark Brown <broonie@linaro.org>
Tue, 20 May 2014 01:22:33 +0000 (02:22 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 20 May 2014 01:22:33 +0000 (02:22 +0100)
commit07e790e40c45b6e7927b88a81fc78c9242a672e9
treed8c03b4b68280825eda492b373535f896369766d
parent57b66b618b5d942b36480e03c2d656d21d04cb1b
arm64: arch_timer: Fix mismerge

Signed-off-by: Mark Brown <broonie@linaro.org>
arch/arm64/include/asm/arch_timer.h