Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 30 Oct 2009 10:36:23 +0000 (10:36 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 30 Oct 2009 10:36:23 +0000 (10:36 +0000)
1  2 
sound/soc/omap/Kconfig

Simple merge