Merge remote-tracking branch 'asoc/topic/enum' into asoc-next
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:44 +0000 (00:23 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:44 +0000 (00:23 +0100)
commite3ac3f2510e5adb62eb4296d3fd0fac5441b2037
tree1c6ef3f82fbd8f77129beb3c411c4b8bf2edd60c
parent566d4eeff85a8112dddab9d455322e1fcf5defe7
parent9de98da2a7531ec9dedfbe95d69ee55237bbd9d5
Merge remote-tracking branch 'asoc/topic/enum' into asoc-next
include/sound/soc-dapm.h
include/sound/soc.h
sound/soc/codecs/adav80x.c
sound/soc/codecs/max98090.c
sound/soc/codecs/mc13783.c
sound/soc/codecs/wm5102.c
sound/soc/codecs/wm5110.c
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8997.c