git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2231571 e9c0390)
Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jun 2011 18:21:09 +0000 (19:21 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Jun 2011 18:21:09 +0000 (19:21 +0100)
Trival fixup for move of I/O code into separate file.

Conflicts:
sound/soc/soc-cache.c


Trivial merge
Pandora Kernel Repository