Merge remote-tracking branch 'asoc/topic/w-codec' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:03 +0000 (15:10 +0800)
committerMark Brown <broonie@kernel.org>
Mon, 9 Feb 2015 07:10:03 +0000 (15:10 +0800)
1  2 
include/sound/soc-dapm.h
sound/soc/codecs/rt286.c
sound/soc/codecs/rt5640.c
sound/soc/codecs/rt5670.c
sound/soc/codecs/rt5677.c
sound/soc/codecs/sgtl5000.c
sound/soc/codecs/tlv320aic3x.c
sound/soc/codecs/wm8731.c
sound/soc/codecs/wm8904.c
sound/soc/codecs/wm9713.c
sound/soc/soc-dapm.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge