Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 3 Apr 2011 10:29:43 +0000 (19:29 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 3 Apr 2011 10:29:43 +0000 (19:29 +0900)
1  2 
sound/soc/codecs/Kconfig

Simple merge