Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sh', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)
1  2  3  4  5 
sound/soc/sti/uniperif_player.c

Simple merge