Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Apr 2011 14:15:15 +0000 (23:15 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 6 Apr 2011 14:15:15 +0000 (23:15 +0900)
1  2 
sound/soc/soc-core.c

Simple merge