git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a387419 b01543d)
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Feb 2012 02:35:12 +0000 (18:35 -0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Feb 2012 02:35:12 +0000 (18:35 -0800)
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
sound/soc/sh/fsi.c


Trivial merge
Pandora Kernel Repository