Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus
authorMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:38 +0000 (15:26 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 15:26:38 +0000 (15:26 +0000)
commit52fe54ef3fe25ae7d8bce738a6558eab8383e19d
tree7c2bfa57ad05cf46e6a49c1fb8d2559ce4375c8c
parent18e63b355e523a19eb4d81f8c1e5c747204e129b
parentc66234cfedfc3e6e3b62563a5f2c1562be09a35d
Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus