git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f030d60 b3c27b5)
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:07:43 +0000 (18:07 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:07:43 +0000 (18:07 +0100)
Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
sound/soc/codecs/wm8994.c


Trivial merge
Pandora Kernel Repository