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)
commit4633fa48fb41dc6d6f0cd83d7f6b7e262820e7cb
tree8dd15df476c14b4ab85d5beca775af561c2ea23d
parent03431972ac16bbfcbfb831bb37c419f8f71bf16d
parent19940b3d55c87d8089a8cb0fa8e5a9918a3846bd
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