| commit | d5efccd5b6843c504042735c1e20d9252daefd98 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Apr 16 19:40:27 2012 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Mon Apr 16 19:40:27 2012 +0100 |
| tree | 87994943963bf2f34b3f1fa982d909fd82f56746 | |
| parent | 516541a00c6a6bced133158f0146b602a18dcbe5 [diff] | |
| parent | e816b57a337ea3b755de72bec38c10c864f23015 [diff] |
ASoC: Merge tag 'v3.4-rc3' into for-3.5 Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting annoyingly with the new development that's going on for Tegra so merge it up to resolve those conflicts. Conflicts: sound/soc/soc-core.c sound/soc/tegra/tegra_i2s.c sound/soc/tegra/tegra_spdif.c