diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-02 21:20:35 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-02 21:20:35 +0200 |
| commit | 6010c4c6c8e60bece2d71173c96400bcd0aae792 (patch) | |
| tree | 56ba38b871fe6851b4d98da62e18b70d5f081feb /sound/soc | |
| parent | ASoC: Remove unused srate variable in tegra_spdif_hw_params (diff) | |
| parent | ASoC: omap_mcpdm_remove cannot be __devexit (diff) | |
| download | linux-6010c4c6c8e60bece2d71173c96400bcd0aae792.tar.xz linux-6010c4c6c8e60bece2d71173c96400bcd0aae792.zip | |
Merge branch 'for-3.1' into for-3.2
Conflicts:
sound/soc/omap/mcpdm.c
sound/soc/omap/mcpdm.h
Diffstat (limited to 'sound/soc')
0 files changed, 0 insertions, 0 deletions