Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 12 Jan 2018 12:28:54 +0000 (12:28 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 12 Jan 2018 12:28:54 +0000 (12:28 +0000)
1  2 
sound/soc/rockchip/rockchip_i2s.c

Simple merge