Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 11:47:06 +0000 (12:47 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 11:47:06 +0000 (12:47 +0100)
1  2 
sound/soc/codecs/wm8915.c

Simple merge