summaryrefslogtreecommitdiff
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-02-07 11:25:44 +0000
committerMark Brown <broonie@kernel.org>2018-02-07 11:25:44 +0000
commit171248777a402f1d95b9f5d5928fe86514182224 (patch)
tree87b9ad19996d5d7484eb69c806b315d1ee11576d /sound/soc/rockchip
parent535b218a7fc7f2918d54fe00e6d7ac385ced3502 (diff)
parent180cad3c58ac435cc96f11b7f9d65b4886d62e30 (diff)
parentdc2a17f4f074c434757e2cef5026d4747fe22955 (diff)
parent72c3818411e5418834472e3edadcf04cfacb1274 (diff)
parentfde7f9dbc71365230eeb8c8ea97ce9b552c8e5bd (diff)
parentedefc8f387a86c2db943db6accd1cd23be2b64a9 (diff)
Merge remote-tracking branches 'asoc/topic/max98373', 'asoc/topic/mtk', 'asoc/topic/pcm', 'asoc/topic/rockchip' and 'asoc/topic/sam9g20_wm8731' into asoc-next