diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 12:00:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-21 12:00:27 +0100 |
| commit | a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843 (patch) | |
| tree | 41dd8005dbeb839c9c92c1ab310e160f405c47df /include/linux | |
| parent | ASoC: WM8903: Implement DMIC support (diff) | |
| parent | ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903 (diff) | |
Merge branch 'tegra' into for-2.6.40
Fix up merge with Harmony driver rename.
Conflicts:
sound/soc/tegra/Kconfig
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions