Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/ml26124' and 'asoc...

diff --cc sound/soc/Kconfig
Simple merge

diff --cc sound/soc/Makefile
Simple merge

diff --cc sound/soc/codecs/ml26124.c
Simple merge

diff --cc sound/soc/omap/rx51.c
Simple merge