Merge remote-tracking branches 'asoc/fix/cs4265', 'asoc/fix/davinci', 'asoc/fix/rockc...
authorMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 22:05:34 +0000 (15:05 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 15 Sep 2014 22:05:34 +0000 (15:05 -0700)
1  2  3  4  5  6 
sound/soc/codecs/cs4265.c
sound/soc/davinci/davinci-mcasp.c

Simple merge
Simple merge