]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Nov 2011 01:17:30 +0000 (01:17 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 8 Nov 2011 01:17:30 +0000 (01:17 +0000)
commit7b672e6be02f955b9c5eb6a9d3ba4f8fcdcefd54
tree8dd15df476c14b4ab85d5beca775af561c2ea23d
parent928dc17212f0b27735aec14dc61f055cbe230890
parentdd647c9830873a878a746bde24cdd8ac8a6e1ea9
Merge branch 'for-3.2' into for-3.3

Conflicts:
sound/soc/codecs/wm8940.c
sound/soc/codecs/tlv320aic3x.c
sound/soc/codecs/wm8904.c
sound/soc/codecs/wm8940.c
sound/soc/codecs/wm8962.c