Merge remote-tracking branches 'asoc/topic/hdmi', 'asoc/topic/intel', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:00 +0000 (13:12 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:00 +0000 (13:12 +0000)
1  2  3  4  5  6 
sound/soc/intel/sst-haswell-pcm.c
sound/soc/soc-jack.c

Simple merge
Simple merge