Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 31 Aug 2011 08:46:42 +0000 (09:46 +0100)
1  2 
sound/soc/soc-cache.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c

Simple merge
Simple merge
Simple merge