git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e5ff4d 28e8680)
Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Mar 2011 12:37:42 +0000 (12:37 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Mar 2011 12:37:42 +0000 (12:37 +0000)
Conflicts:
sound/soc/codecs/wm8978.c
sound/soc/soc-dapm.c


Trivial merge
Pandora Kernel Repository