git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c08be8 9fd369b)
Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 11 Dec 2011 03:24:44 +0000 (11:24 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 11 Dec 2011 03:24:44 +0000 (11:24 +0800)
Conflicts:
sound/soc/mxs/mxs-pcm.c


Trivial merge
Pandora Kernel Repository