Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Oct 2009 15:01:27 +0000 (16:01 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 6 Oct 2009 15:01:27 +0000 (16:01 +0100)
1  2 
sound/soc/davinci/davinci-pcm.c
sound/soc/pxa/pxa-ssp.c

Simple merge
Simple merge