Merge "ARM: arch_timer: Distinguish between CP15 and memory mapped interface" into msm-3.4