mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-10 06:09:23 -04:00
Merge branch 'for-3.1' into for-3.2
Conflicts: sound/soc/omap/mcpdm.c sound/soc/omap/mcpdm.h
This commit is contained in:
commit
6010c4c6c8