Merge changes I9837684e,I612ca129 into msm-3.0

* changes:
  msm: platsmp-8625: Poll for status for core1
  ARM: mach-type: Add machine for 8625 SURF