Merge remote-tracking branch 'asoc/topic/88pm860x' into asoc-next
authorMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:20 +0000 (10:43 +0000)
committerMark Brown <broonie@linaro.org>
Fri, 8 Nov 2013 10:43:20 +0000 (10:43 +0000)
1  2 
sound/soc/codecs/88pm860x-codec.c

Simple merge