]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd6b71f8bab13ea0a7c6c8b66691e8cd72d53905c
tree3a2f1ae599ee4bae60ccf11cc154d73c210c6388
parenta77674645bb37bf06fa0e8956da7463b21f1fdb8
parente0655a250700f831b504218dce70a3fa123edfdb
ASoC: core: Merge Samsung fixes to avoid trivial context conflict

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
sound/soc/samsung/i2s.c