Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Dec 2011 11:01:38 +0000 (11:01 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Dec 2011 11:01:38 +0000 (11:01 +0000)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/jz4740.c

Simple merge
Simple merge