diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-16 16:05:16 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-16 16:05:16 +0100 |
commit | 28e48f0e262fd94a613613d06ac5eaf6745b18a8 (patch) | |
tree | 8ceff69ab0af1d1e109fbdd067c709491531b0bb | |
parent | 1f84acd2dc21b7c3220256b71f7b25d254a3175b (diff) | |
parent | 3d5f615f9fcba6df382bd9a204b5e9ad3080ac48 (diff) | |
parent | c89c7e94bb7d89b39471c79034e3ba1b25d817f5 (diff) | |
parent | 5ab0862e5df95b081bea0205464659baa26b43fe (diff) | |
parent | 4cf612780cec81317a0278b28679a8b69ea8f09c (diff) | |
parent | 6b10998d74398ec8745d54dfdcbcc1eb445a2f9f (diff) | |
download | linux-stable-28e48f0e262fd94a613613d06ac5eaf6745b18a8.tar.gz linux-stable-28e48f0e262fd94a613613d06ac5eaf6745b18a8.tar.bz2 linux-stable-28e48f0e262fd94a613613d06ac5eaf6745b18a8.zip |
Merge remote-tracking branches 'asoc/fix/fsl-dma', 'asoc/fix/fsl-spdif', 'asoc/fix/pxa', 'asoc/fix/rcar' and 'asoc/fix/sigmadsp' into asoc-linus