Merge "msm: 8960: usb: Fix gpiolib warning" into msm-3.0