Merge changes I9143b627,I04683b62 into msm-3.4

* changes:
  msm: 8960: Add gpio configuration for Haptics on 8960 SGLTE
  msm: 8960: Do not register ethernet device for SGLTE