Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
authorMark Brown <broonie@kernel.org>
Thu, 26 Oct 2017 07:45:39 +0000 (09:45 +0200)
committerMark Brown <broonie@kernel.org>
Thu, 26 Oct 2017 07:45:39 +0000 (09:45 +0200)
1  2 
sound/soc/rockchip/rockchip_i2s.c

Simple merge