Merge branch 'for-2.6.36' into for-2.6.37

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 65352c7d4b7fa1f0c9e2f35b95b6a3a76bae9074..42542e0da2a377b96cfa0d40ec26bebbceecb56b 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -249,7 +249,7 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec)
                printk(KERN_WARNING
                       "ASoC: Failed to create codec register debugfs file\n");
 
-       codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744,
+       codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,
                                                     codec->debugfs_codec_root,
                                                     &codec->pop_time);
        if (!codec->debugfs_pop_time)