Merge "epm-adc: Fix lockdep warnings with key's not in .data" into msm-3.4