Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 27 Jan 2011 15:16:52 +0000 (15:16 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 27 Jan 2011 15:16:52 +0000 (15:16 +0000)
1  2 
sound/soc/soc-core.c

Simple merge