aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-04-14 18:12:59 +0100
committerMark Brown <broonie@kernel.org>2017-04-14 18:12:59 +0100
commit799261a6dd0779f82677d9a16960c3f88d081495 (patch)
tree333bd5b3f229ffa47a342871bd91b2750d953ea5 /sound
parentd5439a2e78d2db5b263e13b33369926e8be432ad (diff)
parente6d56d21bdcfd8968c1859bc1892608acad3e6d8 (diff)
parentdb22d189453cee666f8da2e67419f14f4b2fd9d1 (diff)
parentd7344010d183ad62d1ababca3beb9553cf5e1546 (diff)
Merge remote-tracking branches 'asoc/topic/hi6220', 'asoc/topic/imx' and 'asoc/topic/jack' into asoc-next