Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/doc', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:56 +0000 (13:11 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:11:56 +0000 (13:11 +0000)
1  2  3  4  5  6 
sound/soc/sh/fsi.c
sound/soc/soc-pcm.c

Simple merge
Simple merge