git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0343197 19940b3)
Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Nov 2011 01:17:30 +0000 (01:17 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Nov 2011 01:17:30 +0000 (01:17 +0000)
Conflicts:
sound/soc/codecs/wm8940.c


Trivial merge
Pandora Kernel Repository