Merge changes I1bbfe262,I2e7309b9 into msm-3.0

* changes:
  ARM: local timers: Unmask interrupt before new TVAL is set
  ARM: local timers: Interrupt registration mechanism