Merge remote-tracking branch 'asoc/topic/max98088' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:38 +0000 (14:19 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 13 Mar 2014 14:19:38 +0000 (14:19 +0000)
1  2 
sound/soc/codecs/max98088.c

Simple merge