Merge branch 'for-2.6.37' into for-2.6.38

diff --combined sound/soc/codecs/Kconfig
index 658cbe0,3b5690d..8d11fbd
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -22,12 -22,12 +22,13 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_AK4535 if I2C
        select SND_SOC_AK4642 if I2C
        select SND_SOC_AK4671 if I2C
 +      select SND_SOC_ALC562 if I2C
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS42L51 if I2C
        select SND_SOC_CS4270 if I2C
+       select SND_SOC_CX20442
        select SND_SOC_DA7210 if I2C
-       select SND_SOC_JZ4740 if SOC_JZ4740
+       select SND_SOC_JZ4740_CODEC if SOC_JZ4740
        select SND_SOC_MAX98088 if I2C
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_PCM3008
@@@ -130,9 -130,6 +131,9 @@@ config SND_SOC_AK464
  config SND_SOC_AK4671
        tristate
  
 +config SND_SOC_ALC5623
 +       tristate
 +
  config SND_SOC_CQ0093VC
        tristate
  
@@@ -321,4 -318,3 +322,4 @@@ config SND_SOC_WM200
  
  config SND_SOC_WM9090
        tristate
 +