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)
commit91fd3e918d5c6e6a78ea77620196d5f42df689dc
treeab6751d744f35b8ec9b514073bb35503488f7252
parent1ef6f346c62f386f28b0012d6379e2822a3842d3
parent32debfcd3ff0939c93238ddde03ffcc96cca5c60
Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
sound/soc/rockchip/rockchip_i2s.c