summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-02-19 16:35:37 +0000
committerMark Brown <broonie@kernel.org>2017-02-19 16:35:37 +0000
commit39bc30f25329ad16d67760581183ab7828f495cc (patch)
treec64e19b6e7e2755b6066d35a273e1db472d6c54b /sound
parentbd85d189b33bda263bc59602de86391f476a3093 (diff)
parentbcb8c270829a639b8b838809d7c2b540e65f4e01 (diff)
parentebad64d19377957976963f99ce1fcf2f09796357 (diff)
Merge remote-tracking branches 'asoc/fix/fsl-mxs-saif' and 'asoc/fix/sunxi' into asoc-linus