Merge "msm: bam_dmux: Add locking around platform device calls" into msm-3.4