Merge branch 'for-3.2' into for-3.3
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 12 Dec 2011 04:59:06 +0000 (12:59 +0800)
commit0a105ddb35aa702d975cb902d8d2c0cde4f1f231
tree54a33153792a400753d627652a008131403c2fc8
parent43a95197581ac58081772eab3bd5f114da87f98b
parent497d496598f411cb7f0690725a0e8b9029cebdb9
Merge branch 'for-3.2' into for-3.3
sound/soc/codecs/wm8958-dsp2.c
sound/soc/pxa/hx4700.c