Merge branch 'for-2.6.39' into for-2.6.40
Mark Brown [Tue, 3 May 2011 22:30:36 +0000 (23:30 +0100)]
1  2 
sound/soc/mid-x86/sst_platform.c
sound/soc/soc-core.c

Simple merge
Simple merge