Merge changes Idbb393f9,I616d1a27 into msm-3.4

* changes:
  msm: timer: Add a stub for msm_timer_get_timer0_base
  msm: iomap: Add mappings for the MPM PS_HOLD region