Merge branch 'for-2.6.38' into for-2.6.39

diff --cc sound/soc/codecs/wm8994.c
index 0dc1411,4afbe3b..b17ac19
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -109,9 -110,12 +109,12 @@@ struct wm8994_priv 
  
        unsigned int aif1clk_enable:1;
        unsigned int aif2clk_enable:1;
+ 
+       unsigned int aif1clk_disable:1;
+       unsigned int aif2clk_disable:1;
  };
  
 -static int wm8994_readable(unsigned int reg)
 +static int wm8994_readable(struct snd_soc_codec *codec, unsigned int reg)
  {
        switch (reg) {
        case WM8994_GPIO_1:

diff --cc sound/soc/codecs/wm9081.c
Simple merge