Merge changes Ica870d27,Ibaddc7f1 into msm-3.0

* changes:
  ARM: architected timers: Add A15 specific sched_clock implementation
  ARM: local timers: Add A15 architected timer support