summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 13:54:38 +0000
committerMark Brown <broonie@kernel.org>2016-01-11 13:54:38 +0000
commit5450487a0954f87607b14d52a71d44c147d2d0d5 (patch)
treee7eee7cd4ae4dfdc06199f98b278503add6cae46 /sound
parent4aace4ce8d49e1ee46b9690a456752999e53fe92 (diff)
parent8012c983dd0cea8f5be5a02ca75fd8d437227a10 (diff)
parent4ab936d1aca69978dc738592a00e34f836bda1c3 (diff)
Merge remote-tracking branches 'asoc/topic/rcar' and 'asoc/topic/rockchip' into asoc-next