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)
commit0f8dd4ce4775806196300dc075ba8d4f1f9b605d
tree97045026e9780707706149b2ad19e4cc24c78d75
parent35dcf58634cf696966cdec69f62b14a7f49a8c42
parent6c5b756aaa3e4a20c8d4b47b9dc4799b9cfdfcb8
Merge branch 'for-3.1' into for-3.2
sound/soc/soc-cache.c
sound/soc/soc-core.c
sound/soc/soc-dapm.c