Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:45 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:45 +0000 (18:54 +0100)
commit4b57895522b150966eebcf18f929e1c522d90bb9
tree0852de7700b4d6dfeb091ad190c0599e32b6df46
parent2914b7004b932a7ddee97c026ebafd16ab841320
parentcc76e7def0fa27b5f42aea54e34c96b4bddaf30a
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
18 files changed:
include/sound/soc-dapm.h
include/sound/soc.h
sound/soc/codecs/88pm860x-codec.c
sound/soc/codecs/rt5645.c
sound/soc/codecs/rt5677.c
sound/soc/codecs/stac9766.c
sound/soc/codecs/uda1380.c
sound/soc/codecs/wm5102.c
sound/soc/codecs/wm5110.c
sound/soc/codecs/wm8737.c
sound/soc/codecs/wm8900.c
sound/soc/codecs/wm8955.c
sound/soc/codecs/wm8960.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8997.c
sound/soc/codecs/wm9713.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c