Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sh', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)
diff --cc sound/soc/sti/uniperif_player.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 23 Dec 2015 00:23:51 +0000 (00:23 +0000)