Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 19:22:43 +0000 (20:22 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Aug 2011 19:22:43 +0000 (20:22 +0100)
1  2 
sound/soc/codecs/wm8996.c

Simple merge