git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d70934 d65b4e9)
Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Feb 2012 12:00:22 +0000 (12:00 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Feb 2012 12:00:22 +0000 (12:00 +0000)
colliding annoyingly with development.

Linux 3.3-rc3

.. the number of the half-beast?

Conflicts:
sound/soc/codecs/wm5100.c
sound/soc/codecs/wm8994.c


Trivial merge
Pandora Kernel Repository