Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 18 Jan 2011 19:11:23 +0000 (19:11 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 18 Jan 2011 19:11:23 +0000 (19:11 +0000)
1  2 
sound/soc/codecs/Kconfig

Simple merge