Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 21 Sep 2011 13:54:34 +0000 (14:54 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 21 Sep 2011 13:54:34 +0000 (14:54 +0100)
1  2 
sound/soc/soc-core.c

Simple merge