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)
commit907bc6c7fc7071b00083fc11e510e47dd93df45d
tree0697a608561522c00da9e1814974a2eb051bb96d
parentd2b247a8be57647d1745535acd58169fbcbe431a
parent2a0f5cb32772e9a9560209e241a80bfbbc31dbc3
Merge branch 'for-2.6.32' into for-2.6.33
sound/soc/davinci/davinci-pcm.c
sound/soc/pxa/pxa-ssp.c