Merge remote-tracking branches 'asoc/topic/stac9766', 'asoc/topic/sti', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 12 Dec 2016 15:53:21 +0000 (15:53 +0000)
1  2  3  4  5  6 
sound/soc/codecs/sti-sas.c
sound/soc/sti/uniperif_player.c

Simple merge
Simple merge