Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 14:58:37 +0000 (14:58 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 14:58:37 +0000 (14:58 +0000)
1  2 
sound/soc/soc-core.c

Simple merge