Merge branch 'for-2.6.37' into for-2.6.38
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Nov 2010 13:20:12 +0000 (13:20 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 15 Nov 2010 13:20:12 +0000 (13:20 +0000)
1  2 
sound/soc/s3c24xx/rx1950_uda1380.c
sound/soc/soc-dapm.c

Simple merge
Simple merge