Merge branch 'for-3.0' into for-3.1

Browse source

...

This commit is contained in:

Mark Brown 2011-06-23 20:10:28 +01:00

parent df1553c8de 53dea36c70

commit 1ae4e9b996

4 changed files with 5 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

sound/soc/imx/Kconfig

View file

2

sound/soc/imx/imx-pcm-dma-mx2.c

View file

2

sound/soc/imx/imx-ssi.c

View file

4

sound/soc/pxa/pxa2xx-pcm.c

View file