Merge branch 'tegra' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 21 Apr 2011 11:00:27 +0000 (12:00 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 21 Apr 2011 11:00:27 +0000 (12:00 +0100)
commita9e3de6f9f4f3c9deb409d06fa4f4cfbe9878843
tree41dd8005dbeb839c9c92c1ab310e160f405c47df
parent97945c46a23de5f9dfedf1b4a33e51d074df9a9c
parent47912a657ec2aa52c7af5f5e2ecc4efe41094d44
Merge branch 'tegra' into for-2.6.40

Fix up merge with Harmony driver rename.

Conflicts:
sound/soc/tegra/Kconfig
sound/soc/tegra/Kconfig