git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8876698 5f712b2)
Merge branch 'for-2.6.34' into for-2.6.35
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Apr 2010 18:19:32 +0000 (19:19 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 5 Apr 2010 18:19:32 +0000 (19:19 +0100)
Conflicts due to context changes next to the backported DMA data change:
include/sound/soc.h


Trivial merge
Pandora Kernel Repository