Merge "msm: 8960: include msm-specific ion header" into msm-3.4