Merge remote-tracking branch 'asoc/topic/enum' into asoc-next
authorMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:03:59 +0000 (23:03 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 12 Mar 2014 23:03:59 +0000 (23:03 +0000)
commitb8f861586c9c2433b22f81e933845cb8aaa18d9e
treeb075dd0c9156ce45da4ab3099b222cae1163d3bc
parent53a2c4db8cf229047de88b3f1bd41d5a5d2756eb
parent6af5263ceaffc9d4403592dc81cd3b197702dc69
Merge remote-tracking branch 'asoc/topic/enum' into asoc-next
include/sound/soc-dapm.h
include/sound/soc.h
sound/soc/codecs/max98090.c
sound/soc/codecs/rt5640.c
sound/soc/codecs/wm8958-dsp2.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c