Merge branch 'for-2.6.38' into for-2.6.39

2011-01-19 11:22:54 +00:00
parent 492e917635 52fc43f7c1
commit a1926d1745
7488 changed files with 522248 additions and 252446 deletions
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
@@ -1958,7 +1958,7 @@ static int max98088_probe(struct snd_soc_codec *codec)
               return ret;
       }

-       /* initalize private data */
+       /* initialize private data */

       max98088->sysclk = (unsigned)-1;
       max98088->eq_textcnt = 0;