| commit | a9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Apr 21 12:00:27 2011 +0100 |
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | Thu Apr 21 12:00:27 2011 +0100 |
| tree | 41dd8005dbeb839c9c92c1ab310e160f405c47df | |
| 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