Merge branch 'for-2.6.39' into for-2.6.40

diff --cc sound/soc/codecs/ssm2602.c
index 7e2194975360ed357daad656ed2387c1c60108b6,b04d28039c1665d42473bf79df2936938e20acfc..565bc72fb173125df0bc7ba584492b0245fccd7c
--- 1/sound/soc/codecs/ssm2602.c
--- 2/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@@ -551,8 -599,10 +551,8 @@@ static struct snd_soc_codec_driver soc_
        .remove =       ssm2602_remove,
        .suspend =      ssm2602_suspend,
        .resume =       ssm2602_resume,
 -      .read = ssm2602_read_reg_cache,
 -      .write = ssm2602_write,
        .set_bias_level = ssm2602_set_bias_level,
-       .reg_cache_size = sizeof(ssm2602_reg),
+       .reg_cache_size = ARRAY_SIZE(ssm2602_reg),
        .reg_word_size = sizeof(u16),
        .reg_cache_default = ssm2602_reg,
  };