summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-30 16:16:01 +0300
committerMark Brown <broonie@kernel.org>2017-04-30 16:16:01 +0300
commit50946b2aecf747e68a50eefa78f1ff9e009a6c0a (patch)
tree3de18557378711bd15ad855c48b9aa36860dc676 /sound
parent0f57c12ab467494f66c9d616358703ae8a5098d6 (diff)
parent23aaf4ced39de2353e2204c8397418ebb771143a (diff)
parente6d56d21bdcfd8968c1859bc1892608acad3e6d8 (diff)
parent8f7206d69ab8c8fb8620566338d54c4b9b80477a (diff)
downloadlinux-50946b2aecf747e68a50eefa78f1ff9e009a6c0a.tar.xz
Merge remote-tracking branches 'asoc/topic/fsl-ssi', 'asoc/topic/hi6220' and 'asoc/topic/imx' into asoc-next