Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Aug 2011 07:34:05 +0000 (16:34 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 17 Aug 2011 07:34:05 +0000 (16:34 +0900)
1  2 
sound/soc/soc-pcm.c

Simple merge