Merge branch 'for-2.6.38' into for-2.6.39

diff --cc include/sound/wm8903.h
Simple merge

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

diff --cc sound/soc/codecs/wm8994.c
index 0024b4cb8b23737148d734516dfbdb0a392d4e57,a60b5dbf0154789e947b77a8a52ca5049d5326f6..d78abeceaeda4de18fc3d0cab64a99e9bd0ae9f1
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -107,9 -107,12 +107,12 @@@ struct wm8994_priv 
  
        int revision;
        struct wm8994_pdata *pdata;
+ 
+       unsigned int aif1clk_enable:1;
+       unsigned int aif2clk_enable: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/soc-dapm.c
Simple merge