Merge "msm: 8960: Re-order GPIO resources pertaining to SPI" into msm-3.0