Merge branch 'asoc-omap' into for-3.7

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

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

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

diff --cc sound/soc/codecs/wm9712.c
index 6aa1bf8,c6d2076..1992a62
--- 1/sound/soc/codecs/wm9712.c
--- 2/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@@ -147,9 -146,9 +147,9 @@@ SOC_SINGLE("Playback Attenuate (-6dB) S
  SOC_SINGLE("Bass Volume", AC97_MASTER_TONE, 8, 15, 1),
  SOC_SINGLE("Treble Volume", AC97_MASTER_TONE, 0, 15, 1),
  
 -SOC_SINGLE("Capture ADC Switch", AC97_REC_GAIN, 15, 1, 1),
 +SOC_SINGLE("Capture Switch", AC97_REC_GAIN, 15, 1, 1),
  SOC_ENUM("Capture Volume Steps", wm9712_enum[6]),
- SOC_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 1),
+ SOC_DOUBLE("Capture Volume", AC97_REC_GAIN, 8, 0, 63, 0),
  SOC_SINGLE("Capture ZC Switch", AC97_REC_GAIN, 7, 1, 0),
  
  SOC_SINGLE_TLV("Mic 1 Volume", AC97_MIC, 8, 31, 1, main_tlv),

diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge

diff --cc sound/soc/fsl/imx-ssi.c
Simple merge

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

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