Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next

author Mark Brown <[email protected]>

Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)

committer Mark Brown <[email protected]>

Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
author Mark Brown <[email protected]>
Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
committer Mark Brown <[email protected]>
Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
diff --cc sound/soc/rockchip/rk3399_gru_sound.c
Simple merge
diff --cc sound/soc/rockchip/rockchip_i2s.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
committer	Mark Brown <[email protected]>
	Fri, 26 Jan 2018 15:26:53 +0000 (15:26 +0000)
		1	2
sound/soc/rockchip/rk3399_gru_sound.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/rockchip/rockchip_i2s.c	patch \|	diff1 \|	diff2 \|	blob \| history