Merge branch 'for-3.2' into for-3.3
commit6413d542b04800188fd5401d97d141880c638df6
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 21 Nov 2011 17:01:12 +0000 (21 17:01 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 21 Nov 2011 17:01:12 +0000 (21 17:01 +0000)
tree5305c52e37058a64434ccdd71bfcc9f99b61677d
parentcb555318ca5dd5c1426c7a639aa1e90a88c8f024
parented3e80c4c991a52f9fce3421536a78e331ae0949
Merge branch 'for-3.2' into for-3.3
sound/soc/codecs/wm8731.c