diff options
author | Mark Brown <broonie@kernel.org> | 2015-02-09 08:10:23 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-09 08:10:23 +0100 |
commit | 5a7fa6b0d28349d4aa35c6287b9fa186d7224221 (patch) | |
tree | 1260486edd32273b669c52c35c71817debff1e17 /tools/lib/api/fs/fs.c | |
parent | Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/imx', 'aso... (diff) | |
parent | ASoC: mxs-saif: Do not store the irq number in the private structure (diff) | |
parent | ASoC: nuc900: Remove unnecessary snd_pcm_lib_preallocate_free_for_all() (diff) | |
download | linux-5a7fa6b0d28349d4aa35c6287b9fa186d7224221.tar.xz linux-5a7fa6b0d28349d4aa35c6287b9fa186d7224221.zip |
Merge remote-tracking branches 'asoc/topic/mxs-saif' and 'asoc/topic/nuc900' into asoc-next