Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
authorMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:39 +0000 (11:55 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:55:39 +0000 (11:55 +0000)
commitce9d3d0b667dc906ff9fa4a072d565b2b989ceed
tree6cde09fa44e31a5a1d9b498dac4f3214fa87c4b4
parentabb5662499aeaa29362ff5b9cc7966698f87278b
parent09ccdb81cadeed5f4d8409f7a211a32b75b1e597
Merge remote-tracking branch 'asoc/topic/rockchip' into asoc-next
sound/soc/rockchip/rockchip_i2s.c