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 /sound/soc/sh | |
| parent | 97945c46a23de5f9dfedf1b4a33e51d074df9a9c (diff) | |
| parent | 47912a657ec2aa52c7af5f5e2ecc4efe41094d44 (diff) | |
Merge branch 'tegra' into for-2.6.40
Fix up merge with Harmony driver rename.
Conflicts:
sound/soc/tegra/Kconfig
Diffstat (limited to 'sound/soc/sh')
0 files changed, 0 insertions, 0 deletions