Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
authorMark Brown <[email protected]>
Thu, 18 Jan 2018 11:55:39 +0000 (11:55 +0000)
committerMark Brown <[email protected]>
Thu, 18 Jan 2018 11:55:39 +0000 (11:55 +0000)
1  2 
sound/soc/rockchip/rockchip_i2s.c

Simple merge