summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-04 19:31:40 +0400
committerMark Brown <broonie@linaro.org>2014-08-04 19:31:40 +0400
commite7177999dc0f70000a6c54f77f2fa96abf9320a2 (patch)
tree1557da2e821196e5905573f068b8f396dc25d34a /sound/soc
parent01954a7b67021e5899dd85946ffe7609afbaa069 (diff)
parente365500459095276d19a920d5be1a65d0ef9999c (diff)
parent4e13eb722153a5ad66edd80bc26c3028d96a7b93 (diff)
parentc7dfeed10928f00f8c99ad3b58a4f4c5cfd7c581 (diff)
parente5f89768e9bc1f441d18e2299518a2907e5017c9 (diff)
downloadlinux-e7177999dc0f70000a6c54f77f2fa96abf9320a2.tar.xz
Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic/fsl-spdif' and 'asoc/topic/imx-audmux' into asoc-next