diff options
author | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:33 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-08-04 16:31:33 +0100 |
commit | 01954a7b67021e5899dd85946ffe7609afbaa069 (patch) | |
tree | 531d8c43677c8a1b9bba44bce22059cecbb5e0ca /sound/soc/davinci/edma-pcm.c | |
parent | 62e951ea6516ce7fd1a98da0438dbdbfe25a1567 (diff) | |
parent | 12efd9f4b7518081315bdc32ab91291698739047 (diff) | |
parent | c4324bfa54d2a59b4920239c1b10b3e5f3a851d3 (diff) | |
parent | 689dc643859953651ffb7111fdbcff2eb0f02841 (diff) | |
parent | aaed2a62c2890c098113878c66396403f36c8ea9 (diff) | |
parent | 37119dd791f3195ab35cb3b9cccec94bdc709c57 (diff) | |
download | blackbird-op-linux-01954a7b67021e5899dd85946ffe7609afbaa069.tar.gz blackbird-op-linux-01954a7b67021e5899dd85946ffe7609afbaa069.zip |
Merge remote-tracking branches 'asoc/topic/cs4265', 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8', 'asoc/topic/cx20442' and 'asoc/topic/davinci' into asoc-next