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