Merge branch 'for-2.6.34' into for-2.6.35

Browse source

...

This commit is contained in:

Mark Brown 2010-04-17 10:45:54 +09:00

parent d21e0f4cd1 8392609969

commit 890c681275

4 changed files with 45 additions and 29 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

1

sound/soc/codecs/wm2000.c

View file

15

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

View file

55

sound/soc/imx/imx-pcm-fiq.c

View file

3

sound/soc/imx/imx-ssi.c

View file