Merge "msm: mdm: Enable the mdm2 driver on the 8960 cdp." into msm-3.0