git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2e1cc19 c6f9b1e)
ASoC: core: Merge Samsung fixes to avoid trivial context conflict
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Apr 2013 17:22:44 +0000 (18:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 3 Apr 2013 17:22:51 +0000 (18:22 +0100)
Merge branch 'fix/samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into
asoc-component to resolve trivial conflict

Conflicts:
sound/soc/samsung/i2s.c


Trivial merge
Pandora Kernel Repository