Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Nov 2010 21:16:52 +0000 (21:16 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 25 Nov 2010 21:16:52 +0000 (21:16 +0000)
1  2 
sound/soc/codecs/tlv320aic3x.c
sound/soc/omap/osk5912.c

Simple merge
Simple merge