Merge commit 'v2.6.37-rc1' into for-2.6.37

diff --combined sound/soc/soc-core.c
index 805343f,1c8f3f5..614a8b3
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -165,11 -165,8 +165,11 @@@ static ssize_t pmdown_time_set(struct d
  {
        struct snd_soc_pcm_runtime *rtd =
                        container_of(dev, struct snd_soc_pcm_runtime, dev);
 +      int ret;
  
 -      strict_strtol(buf, 10, &rtd->pmdown_time);
 +      ret = strict_strtol(buf, 10, &rtd->pmdown_time);
 +      if (ret)
 +              return ret;
  
        return count;
  }
@@@ -233,6 -230,7 +233,7 @@@ static const struct file_operations cod
        .open = codec_reg_open_file,
        .read = codec_reg_read_file,
        .write = codec_reg_write_file,
+       .llseek = default_llseek,
  };
  
  static void soc_init_codec_debugfs(struct snd_soc_codec *codec)