git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97945c4 47912a6)
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)
Fix up merge with Harmony driver rename.

Conflicts:
sound/soc/tegra/Kconfig


Trivial merge
Pandora Kernel Repository