Merge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Wed, 6 Apr 2011 23:27:06 +0000 (08:27 +0900)]
1  2 
sound/soc/codecs/wm8994.c
sound/soc/soc-core.c

Simple merge
Simple merge