Merge branch 'for-3.1' into for-3.2
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 4 Oct 2011 14:44:43 +0000 (15:44 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 4 Oct 2011 14:44:43 +0000 (15:44 +0100)
1  2 
sound/soc/codecs/wm8994.c

Simple merge