Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)
1  2  3  4  5 
sound/soc/codecs/sgtl5000.c
sound/soc/samsung/smdk_wm8994.c

Simple merge
Simple merge