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)
commit89cab4624a8c0ed81a1b74b6f8c884641cac5b9d
tree3a2f1ae599ee4bae60ccf11cc154d73c210c6388
parent2e1cc199fc8666ac5fda200e8a99f1e4dea07175
parentc6f9b1eb0e5df468891eff17f981b76c86f95f3a
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