Merge commit 'v2.6.35-rc1' into for-2.6.36

diff --combined sound/soc/codecs/wm8990.c
index 731bc07,c018772..dd8d909
--- 1/sound/soc/codecs/wm8990.c
--- 2/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@@ -18,6 -18,7 +18,7 @@@
  #include <linux/pm.h>
  #include <linux/i2c.h>
  #include <linux/platform_device.h>
+ #include <linux/slab.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
@@@ -29,6 -30,8 +30,6 @@@
  
  #include "wm8990.h"
  
 -#define WM8990_VERSION "0.2"
 -
  /* codec private data */
  struct wm8990_priv {
        unsigned int sysclk;
@@@ -1508,6 -1511,8 +1509,6 @@@ static int wm8990_probe(struct platform
        struct wm8990_priv *wm8990;
        int ret;
  
 -      pr_info("WM8990 Audio Codec %s\n", WM8990_VERSION);
 -
        setup = socdev->codec_data;
        codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
        if (codec == NULL)

diff --combined sound/soc/soc-core.c
index 6220bc1,998569d..254dd1c
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -28,6 -28,7 +28,7 @@@
  #include <linux/bitops.h>
  #include <linux/debugfs.h>
  #include <linux/platform_device.h>
+ #include <linux/slab.h>
  #include <sound/ac97_codec.h>
  #include <sound/core.h>
  #include <sound/pcm.h>
@@@ -2351,101 -2352,6 +2352,101 @@@ int snd_soc_limit_volume(struct snd_soc
  }
  EXPORT_SYMBOL_GPL(snd_soc_limit_volume);
  
 +/**
 + * snd_soc_info_volsw_2r_sx - double with tlv and variable data size
 + *  mixer info callback
 + * @kcontrol: mixer control
 + * @uinfo: control element information
 + *
 + * Returns 0 for success.
 + */
 +int snd_soc_info_volsw_2r_sx(struct snd_kcontrol *kcontrol,
 +                      struct snd_ctl_elem_info *uinfo)
 +{
 +      struct soc_mixer_control *mc =
 +              (struct soc_mixer_control *)kcontrol->private_value;
 +      int max = mc->max;
 +      int min = mc->min;
 +
 +      uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
 +      uinfo->count = 2;
 +      uinfo->value.integer.min = 0;
 +      uinfo->value.integer.max = max-min;
 +
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(snd_soc_info_volsw_2r_sx);
 +
 +/**
 + * snd_soc_get_volsw_2r_sx - double with tlv and variable data size
 + *  mixer get callback
 + * @kcontrol: mixer control
 + * @uinfo: control element information
 + *
 + * Returns 0 for success.
 + */
 +int snd_soc_get_volsw_2r_sx(struct snd_kcontrol *kcontrol,
 +                      struct snd_ctl_elem_value *ucontrol)
 +{
 +      struct soc_mixer_control *mc =
 +              (struct soc_mixer_control *)kcontrol->private_value;
 +      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 +      unsigned int mask = (1<<mc->shift)-1;
 +      int min = mc->min;
 +      int val = snd_soc_read(codec, mc->reg) & mask;
 +      int valr = snd_soc_read(codec, mc->rreg) & mask;
 +
 +      ucontrol->value.integer.value[0] = ((val & 0xff)-min);
 +      ucontrol->value.integer.value[1] = ((valr & 0xff)-min);
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(snd_soc_get_volsw_2r_sx);
 +
 +/**
 + * snd_soc_put_volsw_2r_sx - double with tlv and variable data size
 + *  mixer put callback
 + * @kcontrol: mixer control
 + * @uinfo: control element information
 + *
 + * Returns 0 for success.
 + */
 +int snd_soc_put_volsw_2r_sx(struct snd_kcontrol *kcontrol,
 +                      struct snd_ctl_elem_value *ucontrol)
 +{
 +      struct soc_mixer_control *mc =
 +              (struct soc_mixer_control *)kcontrol->private_value;
 +      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
 +      unsigned int mask = (1<<mc->shift)-1;
 +      int min = mc->min;
 +      int ret;
 +      unsigned int val, valr, oval, ovalr;
 +
 +      val = ((ucontrol->value.integer.value[0]+min) & 0xff);
 +      val &= mask;
 +      valr = ((ucontrol->value.integer.value[1]+min) & 0xff);
 +      valr &= mask;
 +
 +      oval = snd_soc_read(codec, mc->reg) & mask;
 +      ovalr = snd_soc_read(codec, mc->rreg) & mask;
 +
 +      ret = 0;
 +      if (oval != val) {
 +              ret = snd_soc_write(codec, mc->reg, val);
 +              if (ret < 0)
 +                      return 0;
 +              ret = 1;
 +      }
 +      if (ovalr != valr) {
 +              ret = snd_soc_write(codec, mc->rreg, valr);
 +              if (ret < 0)
 +                      return 0;
 +              ret = 1;
 +      }
 +
 +      return 0;
 +}
 +EXPORT_SYMBOL_GPL(snd_soc_put_volsw_2r_sx);
 +
  /**
   * snd_soc_dai_set_sysclk - configure DAI system or master clock.
   * @dai: DAI