summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 18:22:44 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-04-03 18:22:51 +0100
commit89cab4624a8c0ed81a1b74b6f8c884641cac5b9d (patch)
tree3a2f1ae599ee4bae60ccf11cc154d73c210c6388 /sound/soc/soc-core.c
parent2e1cc199fc8666ac5fda200e8a99f1e4dea07175 (diff)
parentc6f9b1eb0e5df468891eff17f981b76c86f95f3a (diff)
downloadlinux-89cab4624a8c0ed81a1b74b6f8c884641cac5b9d.tar.bz2
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
Diffstat (limited to 'sound/soc/soc-core.c')
0 files changed, 0 insertions, 0 deletions