Merge branches 'topic/dapm', 'topic/sign', 'topic/adau1373', 'topic/max98090', 'topic...

diff --cc include/sound/soc.h
Simple merge

diff --cc sound/soc/codecs/adau1373.c
Simple merge

diff --cc sound/soc/codecs/mc13783.c
Simple merge

diff --cc sound/soc/codecs/wm8994.c
Simple merge

diff --cc sound/soc/codecs/wm8995.c
Simple merge

diff --cc sound/soc/codecs/wm8996.c
Simple merge

diff --cc sound/soc/omap/ams-delta.c
index 2eca91a51f51d4cf29964f70e65ca26461030ec3,5750de197d0da9bdb86de5a26b0f71fcc635b5c4,629446482a917267706c76982863577a426da11c,629446482a917267706c76982863577a426da11c,629446482a917267706c76982863577a426da11c,629446482a917267706c76982863577a426da11c,629446482a917267706c76982863577a426da11c,629446482a917267706c76982863577a426da11c..8a5363674075072a94a679ad3fc164b79424c4a2
--- 1/sound/soc/omap/ams-delta.c
--- 2/sound/soc/omap/ams-delta.c
--- 3/sound/soc/omap/ams-delta.c
--- 4/sound/soc/omap/ams-delta.c
--- 5/sound/soc/omap/ams-delta.c
--- 6/sound/soc/omap/ams-delta.c
--- 7/sound/soc/omap/ams-delta.c
--- 8/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@@@@@@@@ -103,10 -103,10 -103,10 -103,10 -103,10 -103,10 -103,10 -103,10 +103,10 @@@@@@@@@ static int ams_delta_set_audio_mode(str
                if (!codec->hw_write)
                        return -EUNATCH;
        
 -------        if (ucontrol->value.enumerated.item[0] >= control->max)
 +++++++        if (ucontrol->value.enumerated.item[0] >= control->items)
                        return -EINVAL;
        
- ------        mutex_lock(&codec->mutex);
+ ++++++        snd_soc_dapm_mutex_lock(dapm);
        
                /* Translate selection to bitmap */
                pins = ams_delta_audio_mode_pins[ucontrol->value.enumerated.item[0]];

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/soc-dapm.c
Simple merge